diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-08-15 12:18:49 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-16 08:26:24 +0200 |
| commit | c9406bcffe63f1ce232ce91b00be294e0135282a (patch) | |
| tree | 74aa70ca0ba7911c37c1d7b423db9bfc7c11c524 /qmake/generators/win32/msvc_nmake.h | |
| parent | 15b5b28425f52fcbb2b85c94ec485af841adb4b5 (diff) | |
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>
Diffstat (limited to 'qmake/generators/win32/msvc_nmake.h')
| -rw-r--r-- | qmake/generators/win32/msvc_nmake.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/generators/win32/msvc_nmake.h b/qmake/generators/win32/msvc_nmake.h index 7812902d95..ce8c866adb 100644 --- a/qmake/generators/win32/msvc_nmake.h +++ b/qmake/generators/win32/msvc_nmake.h @@ -53,6 +53,7 @@ class NmakeMakefileGenerator : public Win32MakefileGenerator bool writeMakefile(QTextStream &); void writeImplicitRulesPart(QTextStream &t); void writeBuildRulesPart(QTextStream &t); + void writeLinkCommand(QTextStream &t, const QString &extraFlags = QString(), const QString &extraInlineFileContent = QString()); void init(); protected: |