summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--installerfw.pri3
-rw-r--r--tests/auto/installer/consumeoutputoperationtest/consumeoutputoperationtest.pro2
2 files changed, 4 insertions, 1 deletions
diff --git a/installerfw.pri b/installerfw.pri
index bd84092a3..c71749db2 100644
--- a/installerfw.pri
+++ b/installerfw.pri
@@ -11,6 +11,9 @@ IFW_NEWLINE = $$escape_expand(\\n\\t)
defineReplace(toNativeSeparators) {
return($$replace(1, /, $$QMAKE_DIR_SEP))
}
+defineReplace(fromNativeSeparators) {
+ return($$replace(1, \\\\, /))
+}
defineReplace(cleanPath) {
win32:1 ~= s|\\\\|/|g
diff --git a/tests/auto/installer/consumeoutputoperationtest/consumeoutputoperationtest.pro b/tests/auto/installer/consumeoutputoperationtest/consumeoutputoperationtest.pro
index 0cc9e705c..a6fbc60f9 100644
--- a/tests/auto/installer/consumeoutputoperationtest/consumeoutputoperationtest.pro
+++ b/tests/auto/installer/consumeoutputoperationtest/consumeoutputoperationtest.pro
@@ -5,4 +5,4 @@ QT += testlib
SOURCES = tst_consumeoutputoperationtest.cpp
-DEFINES += "QMAKE_BINARY=$$QMAKE_BINARY"
+DEFINES += "QMAKE_BINARY=$$fromNativeSeparators($$QMAKE_BINARY)"