diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2013-02-11 23:58:43 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-15 16:16:07 +0200 |
| commit | 083b5b503c26297072d15e14036dcfa75533e577 (patch) | |
| tree | b624f16250b82d235a916abf4f3a03f97745dd1d /qmake/generators/win32/msvc_objectmodel.cpp | |
| parent | 6008eb525ecdb7dea9e2b99234e0f1a1d5388a8c (diff) | |
qmake: added support for WindowsMetadataFile
In order to be able to use the linker's /WINMD
and /WINMDFILE options
Change-Id: I2673e20aa073c6b807e8c9f191fd408c7976efc4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake/generators/win32/msvc_objectmodel.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index dab06f5f01..2b343fd9f7 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -1198,6 +1198,7 @@ VCLinkerTool::VCLinkerTool() TurnOffAssemblyGeneration(unset), TypeLibraryResourceID(0), GenerateManifest(unset), + GenerateWindowsMetadata(unset), EnableUAC(unset), UACUIAccess(unset), SectionAlignment(-1), @@ -1265,6 +1266,7 @@ bool VCLinkerTool::parseOption(const char* option) displayHash("/SWAPRUN"); displayHash("/TLBID"); displayHash("/TLBOUT"); displayHash("/TSAWARE"); displayHash("/VERBOSE"); displayHash("/VERSION"); displayHash("/VXD"); displayHash("/WS "); displayHash("/libpath"); + displayHash("/WINMD"); displayHash("/WINMDFILE:"); #endif #ifdef USE_DISPLAY_HASH @@ -1377,6 +1379,15 @@ bool VCLinkerTool::parseOption(const char* option) else GenerateManifest = _True; break; + case 0x34be314: // /WINMD[:NO] + if ((*(option+6) == ':' && (*(option+7) == 'N' || *(option+7) == 'n'))) + GenerateWindowsMetadata = _False; + else + GenerateWindowsMetadata = _True; + break; + case 0x31be7e5: // /WINMDFILE:filename + WindowsMetadataFile = option+11; + break; case 0x8b64559: // /MANIFESTDEPENDENCY:manifest_dependency AdditionalManifestDependencies += option+20; break; |