1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unbreak tool invocation in prefix builds again

Browse Source 
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 <giulio.camuffo@jollamobile.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2015-11-05 11:53:43 +01:00 committed by Giulio Camuffo
parent df757a2e62
commit a9fba41463
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mkspecs/features/qt_tool.prf
View File

@ -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.")