From 402aab76a699f260a72a290fcd131fe7722c8a45 Mon Sep 17 00:00:00 2001 From: kh1 Date: Tue, 20 Nov 2012 14:03:50 +0100 Subject: Follow advice given by Joerg, DEPENDPATH is now deprecated. Change-Id: I8e08618bcc88cc445c317c79d93cdf9f1f2ca5e8 Reviewed-by: Tim Jenssen --- examples/testapp/testapp.pro | 1 - installerfw.pri | 10 +++++++++- src/libs/installer/installer.pro | 8 +++----- src/libs/kdtools/kdtools.pri | 3 +-- src/sdk/sdk.pro | 1 - tests/downloadspeed/downloadspeed.pro | 1 - tests/environmentvariable/environmentvariable.pro | 1 - .../extractarchiveoperationtest.pro | 1 - tests/fileengineclient/fileengineclient.pro | 1 - tests/fileengineserver/fileengineserver.pro | 1 - tests/testreturn/testreturn.pro | 1 - tools/archivegen/archivegen.pro | 5 ++--- tools/binarycreator/binarycreator.pro | 9 ++++----- tools/extractbinarydata/extractbinarydata.pro | 1 - tools/maddehelper/maddehelper.pro | 1 - tools/repocompare/repocompare.pro | 1 - tools/repogen/repogen.pro | 5 ++--- tools/repogenfromonlinerepo/repogenfromonlinerepo.pro | 1 - 18 files changed, 21 insertions(+), 31 deletions(-) diff --git a/examples/testapp/testapp.pro b/examples/testapp/testapp.pro index 1c55a7145..f316315e3 100644 --- a/examples/testapp/testapp.pro +++ b/examples/testapp/testapp.pro @@ -1,5 +1,4 @@ TEMPLATE = app -DEPENDPATH += . .. INCLUDEPATH += . .. TARGET = testapp diff --git a/installerfw.pri b/installerfw.pri index 9a1f632d4..83b35f085 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -51,7 +51,15 @@ equals(TEMPLATE, app):LIBS += -linstaller unix:!macx:LIBS += -lutil macx:LIBS += -framework Carbon -framework Security -CONFIG += uitools +isEqual(QT_MAJOR_VERSION, 4) { + CONFIG += uitools +} else { + QT += uitools + contains(QT, gui): QT += widgets + contains(QT, core): QT += concurrent +} + +CONFIG += depend_includepath CONFIG(static, static|shared) { QT += script network xml } 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 diff --git a/tests/downloadspeed/downloadspeed.pro b/tests/downloadspeed/downloadspeed.pro index 2ee3923f1..7bf859051 100644 --- a/tests/downloadspeed/downloadspeed.pro +++ b/tests/downloadspeed/downloadspeed.pro @@ -1,5 +1,4 @@ TEMPLATE = app -DEPENDPATH += . .. INCLUDEPATH += . .. TARGET = downloadspeed diff --git a/tests/environmentvariable/environmentvariable.pro b/tests/environmentvariable/environmentvariable.pro index 8b268faa5..c294922ff 100644 --- a/tests/environmentvariable/environmentvariable.pro +++ b/tests/environmentvariable/environmentvariable.pro @@ -1,5 +1,4 @@ TEMPLATE = app -DEPENDPATH += . .. INCLUDEPATH += . .. TARGET = environmentvariable diff --git a/tests/extractarchiveoperationtest/extractarchiveoperationtest.pro b/tests/extractarchiveoperationtest/extractarchiveoperationtest.pro index c2517a50a..2fa2ed24e 100644 --- a/tests/extractarchiveoperationtest/extractarchiveoperationtest.pro +++ b/tests/extractarchiveoperationtest/extractarchiveoperationtest.pro @@ -1,5 +1,4 @@ TEMPLATE = app -DEPENDPATH += . .. INCLUDEPATH += . .. TARGET = extractarchiveoperationtest diff --git a/tests/fileengineclient/fileengineclient.pro b/tests/fileengineclient/fileengineclient.pro index 32a1b4f97..6e9eceec9 100644 --- a/tests/fileengineclient/fileengineclient.pro +++ b/tests/fileengineclient/fileengineclient.pro @@ -1,5 +1,4 @@ TEMPLATE = app -DEPENDPATH += . .. INCLUDEPATH += . .. TARGET = fileengineclient diff --git a/tests/fileengineserver/fileengineserver.pro b/tests/fileengineserver/fileengineserver.pro index 9d1019cb7..23589c3ff 100644 --- a/tests/fileengineserver/fileengineserver.pro +++ b/tests/fileengineserver/fileengineserver.pro @@ -1,5 +1,4 @@ TEMPLATE = app -DEPENDPATH += . .. INCLUDEPATH += . .. TARGET = fileengineserver diff --git a/tests/testreturn/testreturn.pro b/tests/testreturn/testreturn.pro index a99a57b7a..5c1781da6 100644 --- a/tests/testreturn/testreturn.pro +++ b/tests/testreturn/testreturn.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = -DEPENDPATH += . INCLUDEPATH += . QT -= gui diff --git a/tools/archivegen/archivegen.pro b/tools/archivegen/archivegen.pro index 252c07962..5f5ad3c46 100644 --- a/tools/archivegen/archivegen.pro +++ b/tools/archivegen/archivegen.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = archivegen -DEPENDPATH += . .. ../common INCLUDEPATH += . .. ../common include(../../installerfw.pri) @@ -12,5 +11,5 @@ CONFIG += console DESTDIR = $$IFW_APP_PATH SOURCES += archive.cpp \ - repositorygen.cpp -HEADERS += repositorygen.h + ../common/repositorygen.cpp +HEADERS += ../common/repositorygen.h diff --git a/tools/binarycreator/binarycreator.pro b/tools/binarycreator/binarycreator.pro index 2d020f45e..22c052fd4 100644 --- a/tools/binarycreator/binarycreator.pro +++ b/tools/binarycreator/binarycreator.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = binarycreator -DEPENDPATH += . .. rcc ../common INCLUDEPATH += . .. rcc ../common include(../../installerfw.pri) @@ -12,8 +11,8 @@ CONFIG += console DESTDIR = $$IFW_APP_PATH SOURCES = binarycreator.cpp \ - rcc.cpp \ - rccmain.cpp \ - repositorygen.cpp -HEADERS = rcc.h + rcc/rcc.cpp \ + rcc/rccmain.cpp \ + ../common/repositorygen.cpp +HEADERS = rcc/rcc.h RESOURCES += binarycreator.qrc diff --git a/tools/extractbinarydata/extractbinarydata.pro b/tools/extractbinarydata/extractbinarydata.pro index 056975fce..712d27477 100644 --- a/tools/extractbinarydata/extractbinarydata.pro +++ b/tools/extractbinarydata/extractbinarydata.pro @@ -1,5 +1,4 @@ TEMPLATE = app -DEPENDPATH += . .. INCLUDEPATH += . .. TARGET = extractbinarydata diff --git a/tools/maddehelper/maddehelper.pro b/tools/maddehelper/maddehelper.pro index bc05bb32e..2f50293de 100644 --- a/tools/maddehelper/maddehelper.pro +++ b/tools/maddehelper/maddehelper.pro @@ -1,5 +1,4 @@ TEMPLATE = app -DEPENDPATH += . .. INCLUDEPATH += . .. TARGET = maddehelper diff --git a/tools/repocompare/repocompare.pro b/tools/repocompare/repocompare.pro index f71eca73c..8bdb83516 100644 --- a/tools/repocompare/repocompare.pro +++ b/tools/repocompare/repocompare.pro @@ -1,5 +1,4 @@ TEMPLATE = app -DEPENDPATH += . .. INCLUDEPATH += . .. TARGET = repocompare diff --git a/tools/repogen/repogen.pro b/tools/repogen/repogen.pro index 75564cfa1..760161c82 100644 --- a/tools/repogen/repogen.pro +++ b/tools/repogen/repogen.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = repogen -DEPENDPATH += . .. ../common INCLUDEPATH += . .. ../common include(../../installerfw.pri) @@ -12,5 +11,5 @@ CONFIG += console DESTDIR = $$IFW_APP_PATH SOURCES += repogen.cpp \ - repositorygen.cpp -HEADERS += repositorygen.h + ../common/repositorygen.cpp +HEADERS += ../common/repositorygen.h diff --git a/tools/repogenfromonlinerepo/repogenfromonlinerepo.pro b/tools/repogenfromonlinerepo/repogenfromonlinerepo.pro index 8b3a01124..0c11efa36 100644 --- a/tools/repogenfromonlinerepo/repogenfromonlinerepo.pro +++ b/tools/repogenfromonlinerepo/repogenfromonlinerepo.pro @@ -1,5 +1,4 @@ TEMPLATE = app -DEPENDPATH += . .. INCLUDEPATH += . .. TARGET = repogenfromonlinerepo -- cgit v1.2.3