From 034b5fd02e19a47fc542a9216d5de7642c0c5a27 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 12 Jul 2012 11:17:40 +0200 Subject: [PATCH] make QMAKE_RESOLVED_TARGET use normalized path separators Change-Id: I23433a67364a9d09fa239b2c7f2cae495d3cc6df Reviewed-by: Joerg Bornemann --- mkspecs/features/resolve_target.prf | 1 - mkspecs/features/testcocoon.prf | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/mkspecs/features/resolve_target.prf b/mkspecs/features/resolve_target.prf index 570ec3b..87d51d7 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 523497d..bf7e3dd 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 -- 2.7.4