diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-06-09 13:40:59 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-06-09 12:25:28 +0000 |
| commit | b05d05fd9ce2aeedfaf805a7ed9007a93c902bc9 (patch) | |
| tree | ad1a3847c53b493db3115d77a34663a0d242b0cf | |
| parent | 1641456366010d2d470e692b80effc601d97fa03 (diff) | |
| download | qt4-tools-b05d05fd9ce2aeedfaf805a7ed9007a93c902bc9.tar.gz | |
fix manifest embedding for VS 2012, VS 2013 and VS 2015
Change-Id: I1fe1eeb31cb8e6b47c1437f62714f07d5675e899
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| -rw-r--r-- | mkspecs/features/win32/embed_manifest_dll.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/win32/embed_manifest_exe.prf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/win32/embed_manifest_dll.prf b/mkspecs/features/win32/embed_manifest_dll.prf index cf96ee7017..824abcc14b 100644 --- a/mkspecs/features/win32/embed_manifest_dll.prf +++ b/mkspecs/features/win32/embed_manifest_dll.prf @@ -1,4 +1,4 @@ -!if(plugin:no_plugin_manifest):if(win32-msvc2005*|win32-msvc2008*|win32-msvc2010*):!static:equals(TEMPLATE, "lib") { +!if(plugin:no_plugin_manifest):if(win32-msvc2005*|win32-msvc2008*|win32-msvc2010*|win32-msvc2012*|win32-msvc2013*|win32-msvc2015*):!static:equals(TEMPLATE, "lib") { MANIFEST_DIR = $$OBJECTS_DIR isEmpty(MANIFEST_DIR):MANIFEST_DIR = . NOPATH_TARGET = $$TARGET diff --git a/mkspecs/features/win32/embed_manifest_exe.prf b/mkspecs/features/win32/embed_manifest_exe.prf index 9bc77029ff..e4effaeb9e 100644 --- a/mkspecs/features/win32/embed_manifest_exe.prf +++ b/mkspecs/features/win32/embed_manifest_exe.prf @@ -1,4 +1,4 @@ -if(win32-msvc2005*|win32-msvc2008*|win32-msvc2010*):equals(TEMPLATE, "app") { +if(win32-msvc2005*|win32-msvc2008*|win32-msvc2010*|win32-msvc2012*|win32-msvc2013*|win32-msvc2015*):equals(TEMPLATE, "app") { MANIFEST_DIR = $$OBJECTS_DIR isEmpty(MANIFEST_DIR):MANIFEST_DIR = . NOPATH_TARGET = $$TARGET |