summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-06-13 17:41:36 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-15 21:39:22 +0200
commit9d48f14a3cdaee24fb41d192c648b1263edeb70d (patch)
tree21a0d6ae0296bc191dec68a99e4c968e7841a72c
parentc932f2cc1352417a760378f59579569673a82b1d (diff)
always $-escape make commands
nmake needs %-escaping in addition to $-escaping, not instead. this has little practical impact, so it went unnoticed. Change-Id: I144b6142eec0151d83a22e0ac5ead7b0415cdafa Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r--mkspecs/features/qt_functions.prf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index abce52c328..ca8391b65a 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -226,7 +226,7 @@ defineTest(qtAddToolEnv) {
}
!contains(TEMPLATE, vc.*) {
contains(MAKEFILE_GENERATOR, MS.*): val ~= s,%,%%,g
- else: val ~= s,\\\$,\$\$,g
+ val ~= s,\\\$,\$\$,g
}
$$1 = "$$val $$eval($$1)"
}