qmake: support incremental linking when embedding manifests
authorJoerg Bornemann <joerg.bornemann@nokia.com>
Wed, 15 Aug 2012 10:18:49 +0000 (12:18 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 16 Aug 2012 06:26:24 +0000 (08:26 +0200)
commitc9406bcffe63f1ce232ce91b00be294e0135282a
tree74aa70ca0ba7911c37c1d7b423db9bfc7c11c524
parent15b5b28425f52fcbb2b85c94ec485af841adb4b5
qmake: support incremental linking when embedding manifests

When embedding manifests we modified the EXE/DLL after linking using
the manifest tool. This breaks the incremental linking feature of MSVC.

The MS way to embed a manifest without breaking incremental linking is:
   - let the linker create the manifest file,
   - create a resource that contains the manifest file,
   - invoke the linker again to embed the resource.

The embed_manifest_{exe|dll}.prf files have been removed.
All manifest logic is now in qmake's nmake makefile generator.

With QMAKE_MANIFEST one can specify a custom manifest file that gets
embedded without disturbing incremental linking.

Task-number: QTBUG-22718
Change-Id: Idb9d2644a0577b2002cbdd2d62b695b9171b1bd5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
mkspecs/features/win32/embed_manifest_dll.prf [deleted file]
mkspecs/features/win32/embed_manifest_exe.prf [deleted file]
qmake/generators/win32/msvc_nmake.cpp
qmake/generators/win32/msvc_nmake.h