diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-09-15 17:30:42 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-09-30 18:33:10 +0200 |
| commit | c016aeba325ae836e665a48221bdda4b0c744f12 (patch) | |
| tree | 01170e2d2875aaa496b99e28c3ab44630b2a13af /mkspecs | |
| parent | 684990d1481b0858489596dc7b28310bb87a6dfa (diff) | |
use correct quoting style when running syncqt under mingw
to this end, add a mode to qtPrepareTool() which prepares the primary
variable for system() use (instead of use in makefiles).
Task-number: QTBUG-41032
Change-Id: If6aa6c206a70ecdbc2ea05bbb3cb470414fb02b1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 14 | ||||
| -rw-r--r-- | mkspecs/features/qt_module_headers.prf | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 709248ac1d..a9a622dd1d 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -187,7 +187,7 @@ defineTest(qtAddRpathLink) { export(QMAKE_RPATHLINKDIR) } -# variable, default, [suffix for variable for system() use] +# variable, default, [suffix for variable for system() use], [prepare primary variable for system() use] defineTest(qtPrepareTool) { cmd = $$eval(QT_TOOL.$${2}.binary) isEmpty(cmd) { @@ -204,16 +204,18 @@ defineTest(qtPrepareTool) { } } QT_TOOL_ENV += $$eval(QT_TOOL.$${2}.envvars) - !isEmpty(3) { + !isEmpty(3)|!isEmpty(4) { $$1$$3 = for (arg, cmd): \ $$1$$3 += $$system_quote($$arg) qtAddTargetEnv($$1$$3, QT_TOOL.$${2}.depends, system) } - $$1 = - for (arg, cmd): \ - $$1 += $$shell_quote($$arg) - qtAddTargetEnv($$1, QT_TOOL.$${2}.depends, ) + isEmpty(4) { + $$1 = + for (arg, cmd): \ + $$1 += $$shell_quote($$arg) + qtAddTargetEnv($$1, QT_TOOL.$${2}.depends, ) + } } # target variable, list of env var names, [non-empty: prepare for system(), not make] diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf index efa964ca14..baeb22d9b4 100644 --- a/mkspecs/features/qt_module_headers.prf +++ b/mkspecs/features/qt_module_headers.prf @@ -12,7 +12,7 @@ load(qt_build_paths) !build_pass:git_build { - qtPrepareTool(QMAKE_SYNCQT, syncqt) + qtPrepareTool(QMAKE_SYNCQT, syncqt, , system) minimal_syncqt { QMAKE_SYNCQT += -minimal $$QMAKE_SYNCQT_OPTIONS } else { |