diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-24 13:39:15 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-25 11:59:15 +0000 |
commit | 0f68ac251214754deb846c8c79f8fed95c12c4d2 (patch) | |
tree | 4763103902fa60db76d88a8c9f4baab539122c76 /configure.pri | |
parent | b71d6ac713da96581494a0b80b4f8e73b5902496 (diff) | |
download | qtbase-0f68ac251214754deb846c8c79f8fed95c12c4d2.tar.gz |
don't cache results of build_parts and skip_modules
as these tests do nothing but validating the command line, caching the
result is more confusing than anything else.
also make the tests silent, so they don't clutter an otherwise fully
cached configure run.
Change-Id: Ifc3d65278769b36a056650f077fd6274a7e192e7
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'configure.pri')
-rw-r--r-- | configure.pri | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.pri b/configure.pri index bd899073c4..21ceb68d33 100644 --- a/configure.pri +++ b/configure.pri @@ -203,6 +203,9 @@ defineTest(qtConfTest_neon) { } defineTest(qtConfTest_skipModules) { + $${1}.cache = - + export($${1}.cache) + skip = uikit { skip += qtdoc qtmacextras qtserialport qtwebkit qtwebkit-examples @@ -220,8 +223,6 @@ defineTest(qtConfTest_skipModules) { } $${1}.value = $$unique(skip) export($${1}.value) - $${1}.cache += value - export($${1}.cache) return(true) } @@ -243,7 +244,7 @@ defineTest(qtConfTest_buildParts) { $${1}.value = $$parts export($${1}.value) - $${1}.cache += value + $${1}.cache = - export($${1}.cache) return(true) } |