diff options
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/configure.pri b/configure.pri index d8ca93d839..d8d0260fa0 100644 --- a/configure.pri +++ b/configure.pri @@ -465,7 +465,9 @@ defineTest(reloadSpec) { $$[QT_HOST_DATA/src]/mkspecs/features/mac/toolchain.prf \ $$[QT_HOST_DATA/src]/mkspecs/features/toolchain.prf - _SAVED_CONFIG = $$CONFIG + saved_variables = CONFIG QMAKE_CXXFLAGS + for (name, saved_variables): \ + _SAVED_$$name = $$eval($$name) load(spec_pre) # qdevice.pri gets written too late (and we can't write it early # enough, as it's populated in stages, with later ones depending @@ -474,7 +476,8 @@ defineTest(reloadSpec) { eval($$l) include($$QMAKESPEC/qmake.conf) load(spec_post) - CONFIG += $$_SAVED_CONFIG + for (name, saved_variables): \ + $$name += $$eval(_SAVED_$$name) load(default_pre) # ensure pristine environment for configuration. again. |