From 5e921da8d074849072149efa0d9db2433f26586e Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 26 Aug 2015 21:11:37 +0200 Subject: [PATCH] updated project files --- general.pri | 3 --- qtutilities.pro | 24 ++++++++++-------------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/general.pri b/general.pri index 89889a6..9b062bc 100644 --- a/general.pri +++ b/general.pri @@ -8,9 +8,6 @@ RCC_DIR = ./res # compiler flags QMAKE_CXXFLAGS += -std=c++11 QMAKE_LFLAGS += -std=c++11 -unix { - QMAKE_LFLAGS += "-Wl,--rpath=./" -} # prefix targetprefix = $$(TARGET_PREFIX) message("Using target prefix \"$${targetprefix}\".") diff --git a/qtutilities.pro b/qtutilities.pro index 2f4356c..3335a07 100644 --- a/qtutilities.pro +++ b/qtutilities.pro @@ -1,5 +1,5 @@ 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) { @@ -16,15 +16,7 @@ CONFIG(noplatformspecificcapslockdetection, noplatformspecificcapslockdetection| DEFINES += PLATFORM_SPECIFIC_CAPSLOCK_DETECTION } -win32 { - CONFIG += dll -} - -contains(DEFINES, PLATFORM_SPECIFIC_CAPSLOCK_DETECTION) { - x11 { - LIBS += -lX11 - } -} +CONFIG += shared SOURCES += resources/resources.cpp \ models/checklistmodel.cpp \ @@ -76,13 +68,17 @@ OTHER_FILES += \ README.md \ LICENSE -# libs and includepath +# libs CONFIG(debug, debug|release) { - LIBS += -L../../ -lc++utilitiesd + LIBS += -lc++utilitiesd } else { - LIBS += -L../../ -lc++utilities + LIBS += -lc++utilities +} +contains(DEFINES, PLATFORM_SPECIFIC_CAPSLOCK_DETECTION) { + x11 { + LIBS += -lX11 + } } -INCLUDEPATH += ../ RESOURCES += resources/qtutilsicons.qrc