diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-04-16 10:27:10 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-17 03:26:32 +0200 |
| commit | 31cfe5ca1b5006566051942254d977581a769e3e (patch) | |
| tree | a867b88d179bab15aec94bdd2c9f50e7e2e7388f | |
| parent | ee4d723ecc24e6be33b4c30f9693b7fdce79c767 (diff) | |
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>
| -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 3410c296ce..235e7ff634 100644 --- a/qmake/generators/win32/msbuild_objectmodel.cpp +++ b/qmake/generators/win32/msbuild_objectmodel.cpp @@ -660,6 +660,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") |