summaryrefslogtreecommitdiffstats
path: root/qmake/generators/win32/msvc_objectmodel.h
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2013-06-18 08:58:31 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-25 12:08:38 +0200
commit28a7af7b2ae1accec904b276d3bd240608d3a73f (patch)
treefc2183536a504f9d0ade99924b1310f6fcf590bf /qmake/generators/win32/msvc_objectmodel.h
parent1b972b210ae1611b2ee07e1c3f545963c7cc31e7 (diff)
basic manifest tool support in vc(x)proj generator
The removal of embed_manifest_dll or embed_manifest_exe from CONFIG now disables the embedding of manifests in VS project files. Task-number: QTBUG-5301 Change-Id: I031318883edca6f9b63a7981ef6c44e3f123f6fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake/generators/win32/msvc_objectmodel.h')
-rw-r--r--qmake/generators/win32/msvc_objectmodel.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
index d289afe366..e60fb1dfca 100644
--- a/qmake/generators/win32/msvc_objectmodel.h
+++ b/qmake/generators/win32/msvc_objectmodel.h
@@ -675,6 +675,16 @@ public:
VCConfiguration* config;
};
+class VCManifestTool : public VCToolBase
+{
+public:
+ VCManifestTool();
+ ~VCManifestTool();
+ bool parseOption(const char* option);
+
+ triState EmbedManifest;
+};
+
class VCMIDLTool : public VCToolBase
{
public:
@@ -874,6 +884,7 @@ public:
VCCLCompilerTool compiler;
VCLinkerTool linker;
VCLibrarianTool librarian;
+ VCManifestTool manifestTool;
VCCustomBuildTool custom;
VCMIDLTool idl;
VCPostBuildEventTool postBuild;
@@ -1127,6 +1138,7 @@ public:
virtual void write(XmlOutput &, const VCCLCompilerTool &);
virtual void write(XmlOutput &, const VCLinkerTool &);
+ virtual void write(XmlOutput &, const VCManifestTool &);
virtual void write(XmlOutput &, const VCMIDLTool &);
virtual void write(XmlOutput &, const VCCustomBuildTool &);
virtual void write(XmlOutput &, const VCLibrarianTool &);