AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

escape constructed command for makefiles

Browse Source 
Change-Id: Iec7f2bd7b02d03bf6a99dde363a41578924e523c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2012-10-18 19:20:34 +02:00 committed by The Qt Project
parent 8c22c9be3e
commit a3941c2f6e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mkspecs/features/qt_functions.prf
View File

@ -192,13 +192,16 @@ defineTest(qtAddToolEnv) {
equals(QMAKE_DIR_SEP, /) { equals(QMAKE_DIR_SEP, /) {
contains($${env}.CONFIG, prepend): infix = \${$$name:+:\$$$name} contains($${env}.CONFIG, prepend): infix = \${$$name:+:\$$$name}
else: infix = else: infix =
$$1 = "$$name=$$join(value, :)$$infix $$eval($$1)" val = "$$name=$$join(value, :)$$infix"
} else { } else {
# Escape closing parens when expanding the variable, otherwise cmd confuses itself. # Escape closing parens when expanding the variable, otherwise cmd confuses itself.
contains($${env}.CONFIG, prepend): infix = ;%$$name:)=^)% contains($${env}.CONFIG, prepend): infix = ;%$$name:)=^)%
else: infix = 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) export($$1)