diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-23 21:11:11 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-12-13 18:55:48 +0000 |
| commit | e2eab15e34181d81bac26613ab72c03240402bf8 (patch) | |
| tree | 0d0586a38e001f05ef89398a44ed24803b434cf5 | |
| parent | 1510c19aff2496e3560312cbd9a1cd2853f90c24 (diff) | |
write HOST_QT_TOOLS to qmodule.pri instead of qhost.pri
its only consumer is qt_tool.prf, which is an internal api.
Change-Id: Iae90b079c5af60efad2ded70d6ea481212e5353a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | configure.pri | 9 | ||||
| -rw-r--r-- | mkspecs/features/qt_tool.prf | 2 |
3 files changed, 10 insertions, 2 deletions
@@ -667,7 +667,6 @@ while [ "$#" -gt 0 ]; do ;; external-hostbindir) CFG_HOST_QT_TOOLS_PATH="$VAL" - HostVar set HOST_QT_TOOLS "$VAL" ;; bindir) QT_INSTALL_BINS="$VAL" diff --git a/configure.pri b/configure.pri index e19861b533..93e2fe894a 100644 --- a/configure.pri +++ b/configure.pri @@ -648,6 +648,15 @@ defineReplace(qtConfOutputPostProcess_publicPro) { return($$output) } +defineReplace(qtConfOutputPostProcess_privatePro) { + output = $$1 + + !isEmpty(config.input.external-hostbindir): \ + output += "HOST_QT_TOOLS = $$val_escape(config.input.external-hostbindir)" + + return($$output) +} + defineReplace(qtConfOutputPostProcess_publicHeader) { qt_version = $$[QT_VERSION] output = \ diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf index 4b73b4b8f7..a8d589f0fa 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf @@ -27,7 +27,7 @@ DEFINES *= QT_USE_QSTRINGBUILDER vars = binary depends - isEmpty(HOST_QT_TOOLS) { + !host_build|isEmpty(HOST_QT_TOOLS) { load(resolve_target) !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private) |