diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-04-16 08:27:10 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-17 18:11:56 (GMT) |
| commit | 1670a7767395b8c5f23a55d1c8d34eafbea971cd (patch) | |
| tree | acb4821286d3a358f64cf9e16dedc992dab6df31 | |
| parent | 79f99d1f81eece5bea5aa7369b4331db5a6ef5b0 (diff) | |
| download | Qt-1670a7767395b8c5f23a55d1c8d34eafbea971cd.zip Qt-1670a7767395b8c5f23a55d1c8d34eafbea971cd.tar.gz Qt-1670a7767395b8c5f23a55d1c8d34eafbea971cd.tar.bz2 | |
qmake vcxproj generator: fix handling of /MANIFEST:NO linker option
Task-number: QTBUG-23513
Change-Id: I5dd6fb6fd7910e43acd28057133a3ad6613cfc1a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit 31cfe5ca1b5006566051942254d977581a769e3e)
| -rw-r--r-- | qmake/generators/win32/msbuild_objectmodel.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp index 684c01e..b87acf3 100644 --- a/qmake/generators/win32/msbuild_objectmodel.cpp +++ b/qmake/generators/win32/msbuild_objectmodel.cpp @@ -662,6 +662,13 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool) << valueTagT(ts); } + const triState generateManifest = tool.SingleProjects.at(i).Configuration.linker.GenerateManifest; + if (generateManifest != unset) { + xml << tag("GenerateManifest") + << attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.SingleProjects.at(i).Configuration.Name)) + << valueTagT(generateManifest); + } + if ( tool.SingleProjects.at(i).Configuration.preBuild.ExcludedFromBuild != unset ) { xml << tag("PreBuildEventUseInBuild") |