From 4aacfb8e11f5862797757d14f34964a05e2d9b1f Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 6 Mar 2015 15:09:59 +0100 Subject: 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 --- src/sdk/installerbase_qt5.rc | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 src/sdk/installerbase_qt5.rc (limited to 'src/sdk/installerbase_qt5.rc') diff --git a/src/sdk/installerbase_qt5.rc b/src/sdk/installerbase_qt5.rc deleted file mode 100644 index 25544aba7..000000000 --- a/src/sdk/installerbase_qt5.rc +++ /dev/null @@ -1,2 +0,0 @@ -IDI_ICON1 ICON DISCARDABLE -"installerbase.ico" -- cgit v1.2.3