deal with %PATH% containing parentheses
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Mon, 9 Jul 2012 12:09:01 +0000 (14:09 +0200)
committerQt by Nokia <qt-info@nokia.com>
Mon, 9 Jul 2012 13:14:44 +0000 (15:14 +0200)
we need to make cmd escape the expanded output, so it doesn't confuse
its own command line parsing (which happens later!).

Change-Id: I0c2c71d276c0aebe3c2163f7f08db8050a14d7ce
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
mkspecs/features/qt_functions.prf

index fe7b29a..ee5acbc 100644 (file)
@@ -157,7 +157,8 @@ defineTest(qtPrepareTool) {
                 error("Operating system not supported.")
             $$1 = "$$var=$$join(deppath, :)${$$var:+:\$$$var} $$eval($$1)"
         } else {
-            $$1 = "(set PATH=$$join(deppath, ;);%PATH%) & $$eval($$1)"
+            # Escape closing parens when expanding %PATH%, otherwise cmd confuses itself.
+            $$1 = "(set PATH=$$join(deppath, ;);%PATH:)=^)%) & $$eval($$1)"
         }
     }