From ad70f2ed20406775e3044c1d22528049b81b9c73 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 20 Jul 2017 16:03:57 +0200 Subject: [PATCH] configure: simplify construction of QMAKE_CONFIG_CACHE there doesn't appear to be a reason for the former complexity. QMAKE_CONFIG_LOG was already assigned the simple way. Change-Id: I6b7e3b5b97c7647237841fa5e16c4959079edc16 Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_configure.prf | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index c3ea334dd8b..dd96fb19366 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -2028,10 +2028,7 @@ for (currentConfig, allConfigs) { } qtConfCheckErrors() -!isEmpty(_QMAKE_SUPER_CACHE_): \ - QMAKE_CONFIG_CACHE = $$dirname(_QMAKE_SUPER_CACHE_)/config.cache -else: \ - QMAKE_CONFIG_CACHE = $$dirname(_QMAKE_CACHE_)/config.cache +QMAKE_CONFIG_CACHE = $$OUT_PWD/config.cache QMAKE_CONFIG_CACHE_USE = $$eval(config.input.cache_use) isEmpty(QMAKE_CONFIG_CACHE_USE): \ QMAKE_CONFIG_CACHE_USE = all