diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-03-06 15:09:59 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-03-11 11:09:27 +0000 |
| commit | 4aacfb8e11f5862797757d14f34964a05e2d9b1f (patch) | |
| tree | e0be259c7fbd24423da3ae71630225691e40f2b5 /src/sdk/sdk.pro | |
| parent | 4b2727c742ff37af82c131e4e4d94045d40ac55a (diff) | |
Fix embedding of installbase manifest
Redefining QMAKE_MANIFEST is currently broken in Qt for newer compilers:
The content is not embedded at all if the toolchain supports "embedding".
But the hack is not needed anyway: Just disable the Qt manifest magic,
and include our custom manifest file via .rc. This way we can also avoid
changing the mkspec for embed_manifest_exe, embed_manifest_dll.
Change-Id: I5155ddabe17f0b61b2d7b9c5b9cd912ad6c53dfe
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Diffstat (limited to 'src/sdk/sdk.pro')
| -rw-r--r-- | src/sdk/sdk.pro | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sdk/sdk.pro b/src/sdk/sdk.pro index a3c973a2c..8e78b121a 100644 --- a/src/sdk/sdk.pro +++ b/src/sdk/sdk.pro @@ -134,9 +134,9 @@ SOURCES = \ commandlineparser.cpp win32 { - # Force to overwrite the default manifest file with our own extended version. - RC_FILE = installerbase_qt5.rc - QMAKE_MANIFEST = installerbase.manifest + # Use our own manifest file + CONFIG -= embed_manifest_exe + RC_FILE = installerbase.rc SOURCES += console_win.cpp } |