diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-06-13 17:37:53 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-15 21:39:17 +0200 |
| commit | c932f2cc1352417a760378f59579569673a82b1d (patch) | |
| tree | 5b049f6c8842380015afc520988f1e35395d6e31 /mkspecs/features/qt_functions.prf | |
| parent | 13e01fda195bcf55e3fb1862c9467ac9cbbf33c1 (diff) | |
fix command over-escaping in vcproj files
the vs ide executes the commands verbatim, so they must not be
make-escaped.
Task-number: QTBUG-31289
Change-Id: Ie73fd5c4da5527c2d10bc94ccdf60f8a1ca21351
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'mkspecs/features/qt_functions.prf')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 4b96c48aa5..abce52c328 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -224,8 +224,10 @@ defineTest(qtAddToolEnv) { else: infix = val = "(set $$name=$$join(value, ;)$$infix) &" } - contains(MAKEFILE_GENERATOR, MS.*): val ~= s,%,%%,g - else: val ~= s,\\\$,\$\$,g + !contains(TEMPLATE, vc.*) { + contains(MAKEFILE_GENERATOR, MS.*): val ~= s,%,%%,g + else: val ~= s,\\\$,\$\$,g + } $$1 = "$$val $$eval($$1)" } } |