From c42be96d808de23f26d71a1c7f2dbeafbe251b92 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Tue, 12 Jun 2018 10:56:46 +0200
Subject: 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>
---
 qmake/generators/win32/msvc_nmake.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'qmake')

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";
-- 
cgit v1.2.3