summaryrefslogtreecommitdiffstats
path: root/qmake/generators
diff options
context:
space:
mode:
authorKatja <katja.marttila@digia.com>2013-06-27 10:50:06 +0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-05 11:36:22 +0200
commit22d1b3a823384123a3398cc444a9c06733f2f720 (patch)
tree0ca4d671b27d11d957ce0e6e0524f666f0abaef0 /qmake/generators
parent28c82a65a4d4817bd4dcea050f5fb3f036257d2f (diff)
MANIFEST:NO is not written to vcproj
When defining QMAKE_LFLAGS += /MANIFEST:NO to pro file, it is not written to vcproj in VS2008. Added MANIFEST:NO generation to vcproj Task-number: QTBUG-31975 Change-Id: I5f84b30db711bf9c317ca20dc65b207140edb398 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake/generators')
-rw-r--r--qmake/generators/win32/msvc_objectmodel.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 4dbba6d974..8c25ab6f9b 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -235,6 +235,7 @@ const char _WarningLevel[] = "WarningLevel";
const char _WholeProgramOptimization[] = "WholeProgramOptimization";
const char _CompileForArchitecture[] = "CompileForArchitecture";
const char _InterworkCalls[] = "InterworkCalls";
+const char _GenerateManifest[] = "GenerateManifest";
// XmlOutput stream functions ------------------------------
inline XmlOutput::xml_output attrT(const char *name, const triState v)
@@ -2649,6 +2650,7 @@ void VCProjectWriter::write(XmlOutput &xml, const VCLinkerTool &tool)
<< attrS(_TypeLibraryFile, tool.TypeLibraryFile)
<< attrL(_TypeLibraryResourceID, tool.TypeLibraryResourceID, /*ifNot*/ rcUseDefault)
<< attrS(_Version, tool.Version)
+ << attrT(_GenerateManifest, tool.GenerateManifest)
<< closetag(_Tool);
}