diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-02 17:08:26 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-07 13:02:14 +0000 |
| commit | 7ac15ab0ffeeb88a156cd5dd935fadcda4a559f9 (patch) | |
| tree | fbb98eadcb4a458de0636a56d5fdbec3959ba19f /mkspecs/features | |
| parent | 2ad4d757546b5bc0ede98af26cb04716ac6662b9 (diff) | |
don't clear config.log unless re-checking
it is counterproductive to clear the log when cached test results are
used, as that makes it hard to determine how they came to be.
-recheck isn't as clear-cut as -recheck-all, as only part of the results
is discarded, and we can't reasonably discard only part of the log. i
opted for clearing the log entirely, as having both the old and new
results in the log would be probably quite confusing.
Change-Id: Ibb391f2ba2ea86d73c23365d46cc66ed8a2158d6
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/configure.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/configure_base.prf | 1 | ||||
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index cc360033d7..147d6f178c 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -4,6 +4,8 @@ cache() load(configure_base) +recheck: write_file($$QMAKE_CONFIG_LOG, "") + isEmpty(QMAKE_CONFIG_TESTS_DIR): QMAKE_CONFIG_TESTS_DIR = $$_PRO_FILE_PWD_/config.tests # Try to build the test project in $$QMAKE_CONFIG_TESTS_DIR/$$1 diff --git a/mkspecs/features/configure_base.prf b/mkspecs/features/configure_base.prf index cd60cc3cc6..4d68affabf 100644 --- a/mkspecs/features/configure_base.prf +++ b/mkspecs/features/configure_base.prf @@ -44,4 +44,3 @@ defineTest(qtRunLoggedCommand) { } QMAKE_CONFIG_LOG = $$dirname(_QMAKE_CACHE_)/config.log -write_file($$QMAKE_CONFIG_LOG, "") diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 1d7e810cc8..810e3106ab 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -1729,6 +1729,8 @@ equals(QMAKE_CONFIG_CACHE_USE, none) { "cache.xplatform = $$[QMAKE_XSPEC]" write_file($$QMAKE_CONFIG_CACHE, cont) } +!equals(QMAKE_CONFIG_CACHE_USE, all): \ + write_file($$QMAKE_CONFIG_LOG, "") for (currentConfig, allConfigs) { qtConfSetModuleName() |