AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure: better suppression magic for old qdevice.pri

Browse Source 
instead of forcing an early load and discarding its contents again
before they could cause harm, trick qmake into not loading it at all.

Change-Id: I672ca9de362b1f23bf5cfea007053570c8534fc6
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Oswald Buddenhagen 2017-01-17 16:50:59 +01:00
parent a4e4f89181
commit fd3ea76d4e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.pri
View File

@ -409,13 +409,12 @@ defineTest(reloadSpec) {
}
# nobody's going to try to re-load the features above,
# so don't bother with being selective.
QMAKE_INTERNAL_INCLUDED_FEATURES =
QMAKE_INTERNAL_INCLUDED_FEATURES = \
# loading it gets simulated below.
$$[QT_HOST_DATA/src]/mkspecs/features/device_config.prf
_SAVED_CONFIG = $$CONFIG
load(spec_pre)
load(device_config) # avoid that the spec loads it later.
# discard possible settings from an earlier configure run.
discard_from($$[QT_HOST_DATA/get]/mkspecs/qdevice.pri)
# qdevice.pri gets written too late (and we can't write it early
# enough, as it's populated in stages, with later ones depending
# on earlier ones). so inject its variables manually.