diff options
| -rw-r--r-- | configure.pri | 2 | ||||
| -rw-r--r-- | mkspecs/features/default_pre.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/configure.pri b/configure.pri index 1c724b16d7..34d7c8cf42 100644 --- a/configure.pri +++ b/configure.pri @@ -444,8 +444,8 @@ defineTest(reloadSpec) { eval($$l) include($$QMAKESPEC/qmake.conf) load(spec_post) - load(default_pre) CONFIG += $$_SAVED_CONFIG + load(default_pre) # ensure pristine environment for configuration. again. discard_from($$[QT_HOST_DATA/get]/mkspecs/qconfig.pri) diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index 1f2f1ff2de..1c24bf071a 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -11,7 +11,7 @@ CONFIG = \ testcase_targets import_plugins import_qpa_plugin \ $$CONFIG -!build_pass:!isEmpty(QT_LICHECK) { +!build_pass:!isEmpty(QT_LICHECK):!QTDIR_build { # # call license checker (but cache result for one day) # diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 2ddcda58b1..58888856da 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -980,7 +980,8 @@ defineTest(qtConfTest_compile) { QMAKE_MAKE = "$$QMAKE_MAKE clean && $$QMAKE_MAKE" mkpath($$test_out_dir)|error() - write_file($$test_base_out_dir/.qmake.cache)|error() + cont = "CONFIG += QTDIR_build" + write_file($$test_base_out_dir/.qmake.cache, cont)|error() # add possible command line args qmake_args += $$qtConfPrepareArgs($$eval($${1}.args)) $$eval($${1}.literal_args) |