diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-16 15:13:52 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-12-13 18:56:34 +0000 |
| commit | ab0cc3055d3d1f0faa98f96a7e8ae58b6ef6461a (patch) | |
| tree | ba14bef85165e3dadaac1b46f5c6cd8a734ececf /mkspecs | |
| parent | 8861b82f9ef59fa871adc86552012cd90eee6e09 (diff) | |
move all target spec handling to qmake-based configure system
we pull this feat off by booting configure with a dummy spec. the proper
spec gets loaded subsequently.
note that it was necessary to move the cache loading after processing
the early checks (from which the spec handling is triggered). this is
just fine, as the cache is needed only by tests, which are forbidden at
this stage by definition.
Change-Id: I5120e25a8bf05fb8cc5485fd93cf6387301089aa
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/dummy/qmake.conf | 8 | ||||
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 16 |
2 files changed, 16 insertions, 8 deletions
diff --git a/mkspecs/dummy/qmake.conf b/mkspecs/dummy/qmake.conf new file mode 100644 index 0000000000..7077fe6345 --- /dev/null +++ b/mkspecs/dummy/qmake.conf @@ -0,0 +1,8 @@ +# +# Minimal qmake configuration qt_configure.prf is run with. +# + +# Make spec_post.prf happy. +MAKEFILE_GENERATOR = DUMMY +QMAKE_PLATFORM = dummy_platform +QMAKE_COMPILER = dummy_compiler diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index b7b4e1f994..41bd75c45d 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -1768,6 +1768,14 @@ QMAKE_SAVED_ARGS = $$QMAKE_EXTRA_ARGS QMAKE_REDO_CONFIG = false qtConfParseCommandLine() +for (currentConfig, allConfigs) { + qtConfSetModuleName() + qtConfSetupModuleOutputs() + # do early checks, mainly to validate the command line + qtConfProcessEarlyChecks() +} +qtConfCheckErrors() + !isEmpty(_QMAKE_SUPER_CACHE_): \ QMAKE_CONFIG_CACHE = $$dirname(_QMAKE_SUPER_CACHE_)/config.cache else: \ @@ -1790,14 +1798,6 @@ QMAKE_CONFIG_LOG = $$OUT_PWD/config.log !equals(QMAKE_CONFIG_CACHE_USE, all): \ write_file($$QMAKE_CONFIG_LOG, "") -for (currentConfig, allConfigs) { - qtConfSetModuleName() - qtConfSetupModuleOutputs() - # do early checks, mainly to validate the command line - qtConfProcessEarlyChecks() -} -qtConfCheckErrors() - CONFIG += qt_conf_tests_allowed logn() logn("Running configuration tests...") |