diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-06-12 10:56:46 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-06-13 12:06:55 +0000 |
| commit | c42be96d808de23f26d71a1c7f2dbeafbe251b92 (patch) | |
| tree | 726b3064a03e90a70ee50c3d53dee99ba47ddadd /qmake | |
| parent | 26ff9aac8e884e09b7dc27de8b051ef4d0f8c077 (diff) | |
Fix QMAKE_MANIFEST for Visual Studio >= 2012
The QMAKE_MANIFEST variable was ignored for VS linkers that support
the /MANIFEST:embed option.
Task-number: QTBUG-59967
Change-Id: I1cdb60ec3a7a5f117942952d4632378ff142daa5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index 680d3736c2..92b4eb5054 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -619,6 +619,8 @@ void NmakeMakefileGenerator::writeBuildRulesPart(QTextStream &t) } } else { manifest = fileFixify(manifest); + if (linkerSupportsEmbedding) + extraLFlags = "/MANIFEST:embed /MANIFESTINPUT:" + escapeFilePath(manifest); } const QString resourceId = (templateName == "app") ? "1" : "2"; |