From a9fba41463c57de93ce7adfb97251964bd6ce4dc Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 5 Nov 2015 11:53:43 +0100 Subject: [PATCH] unbreak tool invocation in prefix builds again the statement order was wrong since c23a086e - we can't use MODULE_DEPENDS before we define it. but actually use a bigger cannon and partially revert the patch, to include .depends unconditionally again. the idea is that this should override a possibly included other .pri file from a previous build/install. (the same argument would sort of apply to .envvars as well, but we assume that its presence won't vary between builds.) Change-Id: I95e9743e367a3d1f45d603d1bb5b31c4875f39a2 Reviewed-by: Giulio Camuffo Reviewed-by: Joerg Bornemann Reviewed-by: David Schulz --- mkspecs/features/qt_tool.prf | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf index 56970adae9..d9d4df6de5 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf @@ -24,14 +24,11 @@ DEFINES *= QT_USE_QSTRINGBUILDER TOOL_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_tool_$${MODULE}.pri - vars = binary + vars = binary depends isEmpty(HOST_QT_TOOLS) { load(resolve_target) - vars += depends - depends_var = "QT_TOOL.$${MODULE}.depends =$$join(MODULE_DEPENDS, " ", " ")" - !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private) !isEmpty(QT_TOOL_ENV) { @@ -61,7 +58,7 @@ DEFINES *= QT_USE_QSTRINGBUILDER TOOL_PRI_CONT = \ "QT_TOOL.$${MODULE}.binary = $$val_escape(bin)" \ - $$depends_var \ + "QT_TOOL.$${MODULE}.depends =$$join(MODULE_DEPENDS, " ", " ")" \ $$module_envvars write_file($$TOOL_PRI, TOOL_PRI_CONT)|error("Aborting.")