diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-31 15:32:02 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-31 19:16:38 (GMT) |
| commit | f9ddd4e138606ed03f4bb585a9e518e39a5fe611 (patch) | |
| tree | b501cbad6c389fd8451e4746213774d441bb7783 /mkspecs/features/win32/embed_manifest_dll.prf | |
| parent | a37dfcfdaa8029f25217fdec6dd6ec1a46929af2 (diff) | |
| download | Qt-f9ddd4e138606ed03f4bb585a9e518e39a5fe611.zip Qt-f9ddd4e138606ed03f4bb585a9e518e39a5fe611.tar.gz Qt-f9ddd4e138606ed03f4bb585a9e518e39a5fe611.tar.bz2 | |
make various POST_LINK steps nicer
put each step into a separate make command.
that makes for cleaner output and less troubles with command separators.
Reviewed-by: mariusSO
Diffstat (limited to 'mkspecs/features/win32/embed_manifest_dll.prf')
| -rw-r--r-- | mkspecs/features/win32/embed_manifest_dll.prf | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mkspecs/features/win32/embed_manifest_dll.prf b/mkspecs/features/win32/embed_manifest_dll.prf index 7305c04..e8711da 100644 --- a/mkspecs/features/win32/embed_manifest_dll.prf +++ b/mkspecs/features/win32/embed_manifest_dll.prf @@ -6,8 +6,7 @@ isEmpty(MANIFEST_DIR):MANIFEST_DIR = . 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);2$$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);2$$escape_expand(\\n\\t))$$QMAKE_POST_LINK QMAKE_CLEAN += \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" } |