Skip to content

Commit

Permalink
qmake: skip license check while building qt
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
ossilator committed Jul 20, 2018
1 parent cdf456f commit 6bc6e6d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion configure.pri
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion mkspecs/features/default_pre.prf
Original file line number Diff line number Diff line change
Expand Up @@ -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)
#
Expand Down
3 changes: 2 additions & 1 deletion mkspecs/features/qt_configure.prf
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 6bc6e6d

Please sign in to comment.