summaryrefslogtreecommitdiffstats
path: root/tests/auto/qmake
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-05-31 05:23:40 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-05-31 05:23:40 (GMT)
commitf587dfeaa9d369235d347af3d14339054ee59908 (patch)
tree3ac92f6a08d871099d8808e8d5fc59f50863bacb /tests/auto/qmake
parentfeb9949a11abbf244e0bfcdc128981596758de40 (diff)
parent9da305aedfaa5da5a3059c99ac5a5389dab42b10 (diff)
downloadQt-f587dfeaa9d369235d347af3d14339054ee59908.zip
Qt-f587dfeaa9d369235d347af3d14339054ee59908.tar.gz
Qt-f587dfeaa9d369235d347af3d14339054ee59908.tar.bz2
Merge remote branch 'staging/4.7' into HEAD
Diffstat (limited to 'tests/auto/qmake')
-rw-r--r--tests/auto/qmake/testdata/functions/functions.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qmake/testdata/functions/functions.pro b/tests/auto/qmake/testdata/functions/functions.pro
index 5e089e4..ad66ee8 100644
--- a/tests/auto/qmake/testdata/functions/functions.pro
+++ b/tests/auto/qmake/testdata/functions/functions.pro
@@ -53,7 +53,7 @@ include( infiletest.pro, "", true )
#replace
VERSION=1.0.0
-VERSION_replaced=$$replace(VERSION,\.,_)
+VERSION_replaced=$$replace(VERSION,\\.,_)
!isEqual(VERSION_replaced, 1_0_0) {
message( "FAILED: replace function: $$VERSION_replaced" )
}