whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <lars.knoll@qt.io>
bb10
Oswald Buddenhagen 2016-11-11 18:01:41 +01:00
parent e71cf69217
commit fa8e467804
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mkspecs/features/configure.prf
View File

@ -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

2
mkspecs/features/configure_base.prf
View File

@ -42,5 +42,3 @@ defineTest(qtRunLoggedCommand) {
!equals(result, 0): return(false)
return(true)
}
QMAKE_CONFIG_LOG = $$dirname(_QMAKE_CACHE_)/config.log

2
mkspecs/features/qt_configure.prf
View File

@ -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, "")