diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-09-02 01:00:14 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-09-02 01:00:14 (GMT) |
| commit | 63eab5ef720936dbb5ee76686c6558e18a79e587 (patch) | |
| tree | 920a29827e6fb83431e90c160616ca73924b455a /mkspecs/features/win32/embed_manifest_exe.prf | |
| parent | 661e237be622a5f7886cee7c06f9daa73d4a07d7 (diff) | |
| parent | e3a76875d1eea19c29fd6c8dec4e0db9252c2d29 (diff) | |
| download | Qt-63eab5ef720936dbb5ee76686c6558e18a79e587.zip Qt-63eab5ef720936dbb5ee76686c6558e18a79e587.tar.gz Qt-63eab5ef720936dbb5ee76686c6558e18a79e587.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'mkspecs/features/win32/embed_manifest_exe.prf')
| -rw-r--r-- | mkspecs/features/win32/embed_manifest_exe.prf | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mkspecs/features/win32/embed_manifest_exe.prf b/mkspecs/features/win32/embed_manifest_exe.prf index 5b37a6d..2d1c09b 100644 --- a/mkspecs/features/win32/embed_manifest_exe.prf +++ b/mkspecs/features/win32/embed_manifest_exe.prf @@ -6,8 +6,7 @@ if(win32-msvc2005*|win32-msvc2008*|win32-msvc2010*):!equals(TEMPLATE_PREFIX, "vc NOPATH_TARGET ~= s,\\\\,/,g # Change to single type separators NOPATH_TARGET ~= s,^(.*/)+,, # Remove all paths QMAKE_LFLAGS += /MANIFEST $$quote(/MANIFESTFILE:\"$${MANIFEST_DIR}\\$${NOPATH_TARGET}.intermediate.manifest\") - QMAKE_PREV_POST_LINK = $$QMAKE_POST_LINK - QMAKE_POST_LINK = $$quote(mt.exe -nologo -manifest \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" -outputresource:$(DESTDIR_TARGET);1$$escape_expand(\\n\\t)) - QMAKE_POST_LINK += $$QMAKE_PREV_POST_LINK + !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$escape_expand(\\n\\t)$$QMAKE_POST_LINK + QMAKE_POST_LINK = $$quote(mt.exe -nologo -manifest \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" -outputresource:$(DESTDIR_TARGET);1$$escape_expand(\\n\\t))$$QMAKE_POST_LINK QMAKE_CLEAN += \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" } |