From 2ad4d757546b5bc0ede98af26cb04716ac6662b9 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 2 Nov 2016 16:58:20 +0100 Subject: move empty cache() call back to configure.prf the new configure system doesn't use this type of caching. also, it's invoked via qt_parts.prf, which actually has the same call. Change-Id: Ifa1e810e24330b59a1eb9f883eb0500642a212f3 Reviewed-by: Lars Knoll --- mkspecs/features/configure.prf | 4 ++++ mkspecs/features/configure_base.prf | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index f275e3ac06..cc360033d7 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -1,3 +1,7 @@ +# Ensure that a cache is present. If none was found on startup, this will create +# one in the build directory of the project which loads this feature. +cache() + load(configure_base) isEmpty(QMAKE_CONFIG_TESTS_DIR): QMAKE_CONFIG_TESTS_DIR = $$_PRO_FILE_PWD_/config.tests diff --git a/mkspecs/features/configure_base.prf b/mkspecs/features/configure_base.prf index dc630a3528..cd60cc3cc6 100644 --- a/mkspecs/features/configure_base.prf +++ b/mkspecs/features/configure_base.prf @@ -43,9 +43,5 @@ defineTest(qtRunLoggedCommand) { return(true) } -# Ensure that a cache is present. If none was found on startup, this will create -# one in the build directory of the project which loads this feature. -cache() - QMAKE_CONFIG_LOG = $$dirname(_QMAKE_CACHE_)/config.log write_file($$QMAKE_CONFIG_LOG, "") -- cgit v1.2.3