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/symbian | |
| 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/symbian')
| -rw-r--r-- | mkspecs/features/symbian/symbian_building.prf | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf index 374fe21..414b081 100644 --- a/mkspecs/features/symbian/symbian_building.prf +++ b/mkspecs/features/symbian/symbian_building.prf @@ -114,14 +114,9 @@ isEmpty(capability): capability = "None" capability = "--capability=$$capability" contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) { - !isEmpty(QMAKE_POST_LINK) { - # No way to honor the '@' :-( - QMAKE_POST_LINK = $$replace(QMAKE_POST_LINK, "^@", "") - QMAKE_POST_LINK = && $$QMAKE_POST_LINK - } - contains(CONFIG, plugin):QMAKE_ELF2E32_FLAGS += --definput=plugin_commonu.def + !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$escape_expand(\\n\\t)$$QMAKE_POST_LINK QMAKE_POST_LINK = $$QMAKE_MOVE $$symbianDestdir/$${baseTarget}.dll $$symbianDestdir/$${baseTarget}.sym \ && $$QMAKE_ELF2E32_WRAPPER --version=$$decVersion \ --sid=$$TARGET.SID \ @@ -166,11 +161,7 @@ contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) { } contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@:.*") { - !isEmpty(QMAKE_POST_LINK) { - # No way to honor the '@' :-( - QMAKE_POST_LINK = $$replace(QMAKE_POST_LINK, "^@", "") - QMAKE_POST_LINK = && $$QMAKE_POST_LINK - } + !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$escape_expand(\\n\\t)$$QMAKE_POST_LINK QMAKE_POST_LINK = $$QMAKE_MOVE $$symbianDestdir/$${baseTarget} $$symbianDestdir/$${baseTarget}.sym \ && $$QMAKE_ELF2E32_WRAPPER --version $$decVersion \ --sid=$$TARGET.SID \ |