diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2013-03-04 13:31:45 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@digia.com> | 2013-03-06 14:37:44 +0100 |
| commit | 61f5549578711152a3abc8906ae2c1c7226c66ad (patch) | |
| tree | 5e9dbb5fa34ba2ffac5bb1bde918577d4877d863 | |
| parent | 0bda027c3431bd8e5c2681cdafeb5cf3d9baf362 (diff) | |
Clean up Qt 5 build rules
Change-Id: I2e494d5f91d1cb740c6254544cf92daaae236f1a
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| -rw-r--r-- | examples/testapp/testapp.pro | 4 | ||||
| -rw-r--r-- | installerfw.pri | 7 | ||||
| -rw-r--r-- | src/libs/installer/installer.pro | 7 | ||||
| -rw-r--r-- | src/sdk/sdk.pro | 7 | ||||
| -rw-r--r-- | tools/archivegen/archivegen.pro | 2 | ||||
| -rw-r--r-- | tools/binarycreator/binarycreator.pro | 2 | ||||
| -rw-r--r-- | tools/repogen/repogen.pro | 2 |
7 files changed, 23 insertions, 8 deletions
diff --git a/examples/testapp/testapp.pro b/examples/testapp/testapp.pro index 418d582ca..4b2e622df 100644 --- a/examples/testapp/testapp.pro +++ b/examples/testapp/testapp.pro @@ -4,6 +4,10 @@ TARGET = testapp include(../../installerfw.pri) +isEqual(QT_MAJOR_VERSION, 5) { + QT += widgets +} + !static { warning("You can use this example only with a static build of Qt and IFW!") } diff --git a/installerfw.pri b/installerfw.pri index bec36d95f..0dcc1b5e4 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -86,9 +86,10 @@ isEqual(QT_MAJOR_VERSION, 4) { QT += script network xml } } else { - QT += uitools xml - contains(QT, gui): QT += widgets - contains(QT, core): QT += concurrent core-private + QT += uitools core-private + CONFIG(static, static|shared) { + QT += concurrent network script xml + } } CONFIG += depend_includepath diff --git a/src/libs/installer/installer.pro b/src/libs/installer/installer.pro index 322c3551c..f4f416cbc 100644 --- a/src/libs/installer/installer.pro +++ b/src/libs/installer/installer.pro @@ -11,10 +11,15 @@ DLLDESTDIR = $$IFW_APP_PATH DEFINES += BUILD_LIB_INSTALLER -QT += script \ +QT += \ + script \ network \ xml +isEqual(QT_MAJOR_VERSION, 5) { + QT += concurrent widgets core-private +} + HEADERS += packagemanagercore.h \ packagemanagercore_p.h \ packagemanagergui.h \ diff --git a/src/sdk/sdk.pro b/src/sdk/sdk.pro index d376535b0..a986b41ef 100644 --- a/src/sdk/sdk.pro +++ b/src/sdk/sdk.pro @@ -4,7 +4,12 @@ TARGET = installerbase include(../../installerfw.pri) -QT += network script +QT += network script xml + +isEqual(QT_MAJOR_VERSION, 5) { + QT += widgets +} + DESTDIR = $$IFW_APP_PATH if (exists($$LRELEASE)) { diff --git a/tools/archivegen/archivegen.pro b/tools/archivegen/archivegen.pro index 5f5ad3c46..f6a40da4f 100644 --- a/tools/archivegen/archivegen.pro +++ b/tools/archivegen/archivegen.pro @@ -5,7 +5,7 @@ INCLUDEPATH += . .. ../common include(../../installerfw.pri) QT -= gui -QT += script +QT += script xml CONFIG += console DESTDIR = $$IFW_APP_PATH diff --git a/tools/binarycreator/binarycreator.pro b/tools/binarycreator/binarycreator.pro index 22c052fd4..342cde286 100644 --- a/tools/binarycreator/binarycreator.pro +++ b/tools/binarycreator/binarycreator.pro @@ -5,7 +5,7 @@ INCLUDEPATH += . .. rcc ../common include(../../installerfw.pri) QT -= gui -QT += script +QT += script xml CONFIG += console DESTDIR = $$IFW_APP_PATH diff --git a/tools/repogen/repogen.pro b/tools/repogen/repogen.pro index 760161c82..20566d600 100644 --- a/tools/repogen/repogen.pro +++ b/tools/repogen/repogen.pro @@ -5,7 +5,7 @@ INCLUDEPATH += . .. ../common include(../../installerfw.pri) QT -= gui -QT += script +QT += script xml CONFIG += console DESTDIR = $$IFW_APP_PATH |