diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-05-02 12:24:59 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-07-20 18:07:48 +0000 |
| commit | 6bc6e6d38859c39dd3def31126cff69259785a0d (patch) | |
| tree | 42cc1382d65add89f152e5b5a4ba47b8c439d8e5 /mkspecs | |
| parent | cdf456f05e0d8ede6b472da52016a5f8b4c66287 (diff) | |
qmake: skip license check while building qt
configure already does it for qt itself, so it's pointless to ever invoke
in default_pre.prf.
to make the exclusion work during the makespec reload during early setup,
we pull ahead the restoration of CONFIG, hoping it won't cause too many
side effects.
another change in qt5 will ensure that top-level builds are also covered.
finally, configure tests also need an explicit exclusion.
that way, attempts to re-configure build trees of commercial builds
after the day of the first configuration do not fail anymore.
Task-number: QTBUG-63452
Change-Id: I42264f64d7621784d4d67bde885a8e501f5ca413
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/default_pre.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 3 |
2 files changed, 3 insertions, 2 deletions
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) |