diff options
author | kh1 <karsten.heimrich@digia.com> | 2012-11-20 14:03:50 +0100 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2012-11-20 15:27:48 +0100 |
commit | 402aab76a699f260a72a290fcd131fe7722c8a45 (patch) | |
tree | 6c4de909d0eda9f452be27e5d828f64127372c5e /src | |
parent | 311045065e4080ed24ef3c3811da9c9ea4711845 (diff) |
Follow advice given by Joerg, DEPENDPATH is now deprecated.
Change-Id: I8e08618bcc88cc445c317c79d93cdf9f1f2ca5e8
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/libs/installer/installer.pro | 8 | ||||
-rw-r--r-- | src/libs/kdtools/kdtools.pri | 3 | ||||
-rw-r--r-- | src/sdk/sdk.pro | 1 |
3 files changed, 4 insertions, 8 deletions
diff --git a/src/libs/installer/installer.pro b/src/libs/installer/installer.pro index 437fb90a2..c0eb50629 100644 --- a/src/libs/installer/installer.pro +++ b/src/libs/installer/installer.pro @@ -1,6 +1,5 @@ TEMPLATE = lib TARGET = installer -DEPENDPATH += . .. INCLUDEPATH += . .. include(../7zip/7zip.pri) @@ -178,8 +177,7 @@ unix:!macx:SOURCES += adminauthorization_x11.cpp win32 { SOURCES += adminauthorization_win.cpp - LIBS += -loleaut32 -lUser32 # 7zip - LIBS += advapi32.lib psapi.lib # kdtools - LIBS += -lole32 # createshortcutoperation - CONFIG(shared, static|shared):LIBS += -lshell32 + LIBS += -loleaut32 -luser32 # 7zip + LIBS += -ladvapi32 -lpsapi # kdtools + LIBS += -lole32 -lshell32 # createshortcutoperation } diff --git a/src/libs/kdtools/kdtools.pri b/src/libs/kdtools/kdtools.pri index a83243502..70385fd2e 100644 --- a/src/libs/kdtools/kdtools.pri +++ b/src/libs/kdtools/kdtools.pri @@ -1,11 +1,10 @@ -DEPENDPATH += $$PWD INCLUDEPATH += $$PWD CONFIG(shared, static|shared) { DEFINES += BUILD_SHARED_KDTOOLS } -FORMS += authenticationdialog.ui +FORMS += $$PWD/authenticationdialog.ui HEADERS += $$PWD/kdtoolsglobal.h \ $$PWD/kdjob.h \ diff --git a/src/sdk/sdk.pro b/src/sdk/sdk.pro index 0594defbf..c103940da 100644 --- a/src/sdk/sdk.pro +++ b/src/sdk/sdk.pro @@ -1,5 +1,4 @@ TEMPLATE = app -DEPENDPATH += . .. INCLUDEPATH += . .. TARGET = installerbase |