From a3941c2f6ef31986bd315fa41bc4df7330a89109 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 18 Oct 2012 19:20:34 +0200 Subject: escape constructed command for makefiles Change-Id: Iec7f2bd7b02d03bf6a99dde363a41578924e523c Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_functions.prf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 2d8f81bae1..1d24ed9c00 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -192,13 +192,16 @@ defineTest(qtAddToolEnv) { equals(QMAKE_DIR_SEP, /) { contains($${env}.CONFIG, prepend): infix = \${$$name:+:\$$$name} else: infix = - $$1 = "$$name=$$join(value, :)$$infix $$eval($$1)" + val = "$$name=$$join(value, :)$$infix" } else { # Escape closing parens when expanding the variable, otherwise cmd confuses itself. contains($${env}.CONFIG, prepend): infix = ;%$$name:)=^)% else: infix = - $$1 = "(set $$name=$$join(value, ;)$$infix) & $$eval($$1)" + val = "(set $$name=$$join(value, ;)$$infix) &" } + contains(MAKEFILE_GENERATOR, MS.*): val ~= s,%,%%,g + else: val ~= s,\\\$,\$\$,g + $$1 = "$$val $$eval($$1)" } } export($$1) -- cgit v1.2.3