diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-23 14:22:19 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-25 11:56:45 +0000 |
| commit | d76a756b03840ef9339ecc30f16e8580c7f323ea (patch) | |
| tree | 44be6418b643e6492621199e647f94c14a3071df /configure.pri | |
| parent | 12bb328bb0be8efe54aae750c21938aab4d17539 (diff) | |
clean up qconfig/qmodule.pri handling in configure
instead of saving the files away and restoring them afterwards, use the
new and shiny discard_from() function to throw away everything the files
might contain.
strictly speaking, this is not precise, as the pris may also use *=, -=,
and possibly other operations which cannot be trivially undone, but the
purpose is essentially to discard the special outputs of some features
which may affect subsequent tests, for which this is sufficient.
as a side effect, the failure to load qmodule.pri is not fatal any more
(like for qconfig.pri), to save the pointless effort of ensuring that it
exists.
Change-Id: I07625b60c4f2e27b21206b2c16d24ab111737395
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri index 0a25d46b00..bd899073c4 100644 --- a/configure.pri +++ b/configure.pri @@ -773,6 +773,10 @@ defineTest(qtConfReport_buildMode) { qtConfReportPadded($$1, $$build_mode) } +# ensure pristine environment for configuration +discard_from($$[QT_HOST_DATA/get]/mkspecs/qconfig.pri) +discard_from($$[QT_HOST_DATA/get]/mkspecs/qmodule.pri) + # load and process input from configure exists("$$OUT_PWD/config.tests/configure.cfg") { include("$$OUT_PWD/config.tests/configure.cfg") |