updated project files

This commit is contained in:
Martchus 2015-08-26 21:11:37 +02:00
parent 7ba1b2ba58
commit 5e921da8d0
2 changed files with 10 additions and 17 deletions

View File

@ -8,9 +8,6 @@ RCC_DIR = ./res
# compiler flags # compiler flags
QMAKE_CXXFLAGS += -std=c++11 QMAKE_CXXFLAGS += -std=c++11
QMAKE_LFLAGS += -std=c++11 QMAKE_LFLAGS += -std=c++11
unix {
QMAKE_LFLAGS += "-Wl,--rpath=./"
}
# prefix # prefix
targetprefix = $$(TARGET_PREFIX) targetprefix = $$(TARGET_PREFIX)
message("Using target prefix \"$${targetprefix}\".") message("Using target prefix \"$${targetprefix}\".")

View File

@ -1,5 +1,5 @@
projectname = qtutilities projectname = qtutilities
VERSION = 1.0.6 VERSION = 2.0.0
# include ../../common.pri when building as part of a subdirs project; otherwise include general.pri # include ../../common.pri when building as part of a subdirs project; otherwise include general.pri
!include(../../common.pri) { !include(../../common.pri) {
@ -16,15 +16,7 @@ CONFIG(noplatformspecificcapslockdetection, noplatformspecificcapslockdetection|
DEFINES += PLATFORM_SPECIFIC_CAPSLOCK_DETECTION DEFINES += PLATFORM_SPECIFIC_CAPSLOCK_DETECTION
} }
win32 { CONFIG += shared
CONFIG += dll
}
contains(DEFINES, PLATFORM_SPECIFIC_CAPSLOCK_DETECTION) {
x11 {
LIBS += -lX11
}
}
SOURCES += resources/resources.cpp \ SOURCES += resources/resources.cpp \
models/checklistmodel.cpp \ models/checklistmodel.cpp \
@ -76,13 +68,17 @@ OTHER_FILES += \
README.md \ README.md \
LICENSE LICENSE
# libs and includepath # libs
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
LIBS += -L../../ -lc++utilitiesd LIBS += -lc++utilitiesd
} else { } else {
LIBS += -L../../ -lc++utilities LIBS += -lc++utilities
}
contains(DEFINES, PLATFORM_SPECIFIC_CAPSLOCK_DETECTION) {
x11 {
LIBS += -lX11
}
} }
INCLUDEPATH += ../
RESOURCES += resources/qtutilsicons.qrc RESOURCES += resources/qtutilsicons.qrc