AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qmake vcxproj generator: fix handling of /MANIFEST:NO linker option

Browse Source 
Task-number: QTBUG-23513

Change-Id: I5dd6fb6fd7910e43acd28057133a3ad6613cfc1a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Joerg Bornemann 2012-04-16 10:27:10 +02:00 committed by Qt by Nokia
parent ee4d723ecc
commit 31cfe5ca1b
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qmake/generators/win32/msbuild_objectmodel.cpp
View File

@ -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")