diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-12 11:17:40 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-16 01:06:55 +0200 |
| commit | 034b5fd02e19a47fc542a9216d5de7642c0c5a27 (patch) | |
| tree | 0a3d4f16136d946d0450cafb69001db2dfff2728 /mkspecs | |
| parent | 61d67ace5f538c14f83f1eaec65d1ccf643c083c (diff) | |
make QMAKE_RESOLVED_TARGET use normalized path separators
Change-Id: I23433a67364a9d09fa239b2c7f2cae495d3cc6df
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/resolve_target.prf | 1 | ||||
| -rw-r--r-- | mkspecs/features/testcocoon.prf | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/mkspecs/features/resolve_target.prf b/mkspecs/features/resolve_target.prf index 570ec3bf5d..87d51d743e 100644 --- a/mkspecs/features/resolve_target.prf +++ b/mkspecs/features/resolve_target.prf @@ -1,7 +1,6 @@ QMAKE_RESOLVED_TARGET = $$absolute_path($$DESTDIR, $$OUT_PWD)/ win32 { - QMAKE_RESOLVED_TARGET ~= s,/,\\, contains(TEMPLATE, .*lib) { isEmpty(TARGET_VERSION_EXT):!isEmpty(VERSION) { TARGET_VERSION_EXT = $$section(VERSION, ., 0, 0) diff --git a/mkspecs/features/testcocoon.prf b/mkspecs/features/testcocoon.prf index 523497dba1..bf7e3dd463 100644 --- a/mkspecs/features/testcocoon.prf +++ b/mkspecs/features/testcocoon.prf @@ -25,7 +25,7 @@ TESTCOCOON_COVERAGE_OPTIONS = \ # is built directly in target.path and there is no need to move the csmes. !isEmpty(DESTDIR):contains(TEMPLATE, lib) { !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$escape_expand(\\n\\t)$$QMAKE_POST_LINK - QMAKE_POST_LINK = -$(MOVE) $${TARGET_BASENAME}.csmes $${QMAKE_RESOLVED_TARGET}.csmes$$QMAKE_POST_LINK + QMAKE_POST_LINK = -$(MOVE) $${TARGET_BASENAME}.csmes $$native_path($${QMAKE_RESOLVED_TARGET}.csmes)$$QMAKE_POST_LINK } QMAKE_CLEAN += *.csexe *.csmes |