diff options
| -rw-r--r-- | src/sdk/sdk.pro | 11 | ||||
| -rw-r--r-- | tests/auto/installer/task/task.pro | 6 |
2 files changed, 4 insertions, 13 deletions
diff --git a/src/sdk/sdk.pro b/src/sdk/sdk.pro index 416892310..2701b40ca 100644 --- a/src/sdk/sdk.pro +++ b/src/sdk/sdk.pro @@ -121,15 +121,8 @@ SOURCES = installerbase.cpp \ win32 { # Force to overwrite the default manifest file with our own extended version. - isEqual(QT_MAJOR_VERSION, 4) { - !win32-g++* { - win32:RC_FILE = installerbase.rc - QMAKE_POST_LINK += $$quote(mt.exe -updateresource:$$IFW_APP_PATH/$${TARGET}.exe -manifest \"$${IFW_SOURCE_TREE}\\src\\sdk\\installerbase.manifest\") - } - } else { - RC_FILE = installerbase_qt5.rc - QMAKE_MANIFEST = installerbase.manifest - } + RC_FILE = installerbase_qt5.rc + QMAKE_MANIFEST = installerbase.manifest } macx:include(../../no_app_bundle.pri) diff --git a/tests/auto/installer/task/task.pro b/tests/auto/installer/task/task.pro index ff41f5cce..9ea8f30ed 100644 --- a/tests/auto/installer/task/task.pro +++ b/tests/auto/installer/task/task.pro @@ -1,8 +1,6 @@ include(../../qttest.pri) QT -= gui -QT += network -isEqual(QT_MAJOR_VERSION, 5) { - QT += concurrent -} +QT += network concurrent + SOURCES += tst_task.cpp |