From fa8e467804428127429ca91aaa1538bae70b1871 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 11 Nov 2016 18:01:41 +0100 Subject: fix configure logging when no cache is present yet this got broken in 2ad4d75754. however, the new configure system operates from the top-level build dir anyway, so there is no point in messing with the cache as a reference point to start with - just use OUT_PWD. Task-number: QTBUG-57120 Change-Id: I69629bf497931574bff8452939170abb1776ab60 Reviewed-by: Lars Knoll --- mkspecs/features/configure.prf | 1 + mkspecs/features/configure_base.prf | 2 -- mkspecs/features/qt_configure.prf | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index 62eae6d813..4ca7c6ba07 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -4,6 +4,7 @@ cache() load(configure_base) +QMAKE_CONFIG_LOG = $$dirname(_QMAKE_CACHE_)/config.log recheck: write_file($$QMAKE_CONFIG_LOG, "") 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 4d68affabf..4e7292451e 100644 --- a/mkspecs/features/configure_base.prf +++ b/mkspecs/features/configure_base.prf @@ -42,5 +42,3 @@ defineTest(qtRunLoggedCommand) { !equals(result, 0): return(false) return(true) } - -QMAKE_CONFIG_LOG = $$dirname(_QMAKE_CACHE_)/config.log diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 38305890b5..2810faad1a 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -1768,6 +1768,8 @@ equals(QMAKE_CONFIG_CACHE_USE, none) { "cache.xplatform = $$[QMAKE_XSPEC]" write_file($$QMAKE_CONFIG_CACHE, cont) } + +QMAKE_CONFIG_LOG = $$OUT_PWD/config.log !equals(QMAKE_CONFIG_CACHE_USE, all): \ write_file($$QMAKE_CONFIG_LOG, "") -- cgit v1.2.3