1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: move qtConfTest_verifySpec() out of qt_configure.prf

Browse Source 
the callback is specific to qtbase/configure.json, so it belongs into
qtbase/configure.pri.

amends d90db0f136.

Change-Id: I905f985e2d3d2e42c4587cbacdea8dc3eb09a5be
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Oswald Buddenhagen 2018-06-29 17:34:14 +02:00
parent ced0bd8068
commit 6d0878db1b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.pri
View File

@ -251,6 +251,11 @@ defineTest(qtConfTest_machineTuple) {
return(true) return(true)
} }
defineTest(qtConfTest_verifySpec) {
qtConfTest_compile($$1): return(true)
qtConfFatalError("Cannot compile a minimal program. The toolchain or QMakeSpec is broken.", log)
}
defineTest(qtConfTest_architecture) { defineTest(qtConfTest_architecture) {
!qtConfTest_compile($${1}): \ !qtConfTest_compile($${1}): \
error("Could not determine $$eval($${1}.label). See config.log for details.") error("Could not determine $$eval($${1}.label). See config.log for details.")

5
mkspecs/features/qt_configure.prf
View File

@ -1033,11 +1033,6 @@ defineTest(qtConfTest_compile) {
return(false) return(false)
} }
defineTest(qtConfTest_verifySpec) {
qtConfTest_compile($$1): return(true)
qtConfFatalError("Cannot compile a minimal program. The toolchain or QMakeSpec is broken.", log)
}
defineTest(qtConfTest_files) { defineTest(qtConfTest_files) {
for(i, $${1}.files._KEYS_) { for(i, $${1}.files._KEYS_) {
f = $$eval($${1}.files.$${i}) f = $$eval($${1}.files.$${i})