diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-17 16:50:59 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-19 21:48:17 +0000 |
| commit | fd3ea76d4ef0a9d287e618c2ab074eb7515fa778 (patch) | |
| tree | 17f04f8901b100092f41e5c1e05c637bbd0acda1 | |
| parent | a4e4f8918183608a0449c5d60622e6b355b8dbbd (diff) | |
configure: better suppression magic for old qdevice.pri
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>
| -rw-r--r-- | configure.pri | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/configure.pri b/configure.pri index b184ceff5b..cc173b6777 100644 --- a/configure.pri +++ b/configure.pri @@ -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. |