From e15fe10836a39ffdff0a78031595a6f24bf8aa1c Mon Sep 17 00:00:00 2001
From: kh1 <karsten.heimrich@digia.com>
Date: Tue, 4 Feb 2014 11:30:04 +0100
Subject: [PATCH] Compile fix after native separator change.
Change-Id: I3044637a65b87483dd9ded63920adb5536952700
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
installerfw.pri | 3 +++
.../consumeoutputoperationtest/consumeoutputoperationtest.pro | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/installerfw.pri b/installerfw.pri
index bd84092a..c71749db 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 0cc9e705..a6fbc60f 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)"