diff options
| author | kh1 <karsten.heimrich@digia.com> | 2014-02-04 11:30:04 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2014-02-04 11:35:33 +0100 |
| commit | e15fe10836a39ffdff0a78031595a6f24bf8aa1c (patch) | |
| tree | 4ffadd9941416309cfa5c6d05c44dd48d209353c | |
| parent | 0c83dabd59ff995bc898013695f24fdeadecd459 (diff) | |
Compile fix after native separator change.
Change-Id: I3044637a65b87483dd9ded63920adb5536952700
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | installerfw.pri | 3 | ||||
| -rw-r--r-- | tests/auto/installer/consumeoutputoperationtest/consumeoutputoperationtest.pro | 2 |
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)" |