From e351ccfc12ec6cf33c7268683c1877a7711f2969 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 19 Nov 2014 14:55:13 +0100 Subject: add value quoting to qtAddToolEnv() for sh, this is usual quoting. for cmd, this means escaping closing parens - everything else is permitted anyway. Change-Id: I1179849d95f1f1f9e4b0d62ecd88917a1327f60f Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_functions.prf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mkspecs/features/qt_functions.prf') diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 4dfffc4c2f..40dd9033dd 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -232,11 +232,12 @@ defineTest(qtAddToolEnv) { equals(ds, /) { contains($${env}.CONFIG, prepend): infix = \${$$name:+:\$$$name} else: infix = - val = "$$name=$$join(value, :)$$infix" + val = "$$name=$$shell_quote($$join(value, :))$$infix" } else { # Escape closing parens when expanding the variable, otherwise cmd confuses itself. contains($${env}.CONFIG, prepend): infix = ;%$$name:)=^)% else: infix = + value ~= s,\\),^),g val = "(set $$name=$$join(value, ;)$$infix) &" } isEmpty(3): !contains(TEMPLATE, vc.*) { -- cgit v1.2.3