diff options
| -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 { |