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 /configure.pri | |
| 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 'configure.pri')
| -rw-r--r-- | configure.pri | 2 |
1 files changed, 1 insertions, 1 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) |