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 --- doc/installerfw-getting-started.qdoc | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'doc') diff --git a/doc/installerfw-getting-started.qdoc b/doc/installerfw-getting-started.qdoc index 29e0dbac8..ba1ec08a2 100644 --- a/doc/installerfw-getting-started.qdoc +++ b/doc/installerfw-getting-started.qdoc @@ -68,16 +68,13 @@ runtime library. This can be done by changing the default mkspec of your compiler. - If you are using e.g. the Microsoft Visual Studio 2010 compiler, you edit - \c{mkspecs\win32-msvc2010\qmake.conf} and replace in the CFLAGS sections - '-MD' with '-MT'. Furthermore you should remove 'embed_manifest_dll' - and 'embed_manifest_exe' from CONFIG: + If you are using e.g. the Microsoft Visual Studio 2013 compiler, you edit + \c{mkspecs\win32-msvc2013\qmake.conf} and replace in the CFLAGS sections + '-MD' with '-MT': \code - CONFIG += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source copy_dir_files debug_and_release debug_and_release_target - # .. - QMAKE_CFLAGS_RELEASE = -O2 -MT - QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MT -Zi + QMAKE_CFLAGS_RELEASE = -O2 -MT -Zc:strictStrings + QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MT -Zi -Zc:strictStrings QMAKE_CFLAGS_DEBUG = -Zi -MTd \endcode -- cgit v1.2.3