diff options
| author | kh1 <karsten.heimrich@digia.com> | 2012-11-21 17:57:32 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2012-11-22 11:38:47 +0100 |
| commit | 839f9f4d8a2aa41a8957e3c4337e3502baa927b7 (patch) | |
| tree | b8cba0543f121ad595a469e109d0755b6f57f405 /src/sdk | |
| parent | 541399200a32580ef8d29af15cceae689ad1ce56 (diff) | |
Adjust to compile with Qt5.
Change-Id: I82672d7da43ce51703a02d2174617ce121c6fafa
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src/sdk')
| -rw-r--r-- | src/sdk/installerbase_qt5.rc | 2 | ||||
| -rw-r--r-- | src/sdk/sdk.pro | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/sdk/installerbase_qt5.rc b/src/sdk/installerbase_qt5.rc new file mode 100644 index 000000000..25544aba7 --- /dev/null +++ b/src/sdk/installerbase_qt5.rc @@ -0,0 +1,2 @@ +IDI_ICON1 ICON DISCARDABLE +"installerbase.ico" diff --git a/src/sdk/sdk.pro b/src/sdk/sdk.pro index ebfd2ff09..461670cb9 100644 --- a/src/sdk/sdk.pro +++ b/src/sdk/sdk.pro @@ -81,6 +81,11 @@ SOURCES = installerbase.cpp \ win32 { # Force to overwrite the default manifest file with our own extended version. - 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\") + isEqual(QT_MAJOR_VERSION, 4) { + 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 + } } |