diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2014-02-07 12:17:46 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2014-02-07 12:24:57 +0100 |
| commit | 2e6683cfdbe8d086aa3959dabdae17e3a2d05619 (patch) | |
| tree | dd5c9e939ad1162f43add8a4320c05fc7847e16c /tests | |
| parent | ec6dd389c13fd9c0c9c10887531a969b657cdf24 (diff) | |
| parent | a38e67cdcb2c6a1080c7f2ad0186b7627f6072dd (diff) | |
Merge remote-tracking branch 'origin/1.5'
Change-Id: I75a37b5dce14d454c404eda4f0c7b0b61ca66cf7
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/installer/consumeoutputoperationtest/consumeoutputoperationtest.pro | 2 |
1 files changed, 1 insertions, 1 deletions
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)" |