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

build the configure tests in the top-level build dir

Browse Source 
there isn't really a point in doing strict shadow builds of them, and
it complicates stand-alone building of sub-projects (because it points
below the build root).

Task-number: QTBUG-58372
Change-Id: Ia3bde3826baac44749b27452fd4aeb9491ecb94e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Oswald Buddenhagen 2017-05-15 14:14:28 +02:00
parent 76223ecbaa
commit 5dab77ba96
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.pri
View File

@ -252,7 +252,7 @@ defineTest(qtConfTest_architecture) {
error("Could not determine $$eval($${1}.label). See config.log for details.") error("Could not determine $$eval($${1}.label). See config.log for details.")
test = $$eval($${1}.test) test = $$eval($${1}.test)
test_out_dir = $$shadowed($$QMAKE_CONFIG_TESTS_DIR/$$test) test_out_dir = $$OUT_PWD/$$basename(QMAKE_CONFIG_TESTS_DIR)/$$test
unix:exists($$test_out_dir/arch): \ unix:exists($$test_out_dir/arch): \
content = $$cat($$test_out_dir/arch, blob) content = $$cat($$test_out_dir/arch, blob)
else: win32:exists($$test_out_dir/arch.exe): \ else: win32:exists($$test_out_dir/arch.exe): \

4
mkspecs/features/qt_configure.prf
View File

@ -326,7 +326,7 @@ defineTest(qtConfParseCommandLine) {
} }
defineReplace(qtConfToolchainSupportsFlag) { defineReplace(qtConfToolchainSupportsFlag) {
test_out_dir = $$shadowed($$QMAKE_CONFIG_TESTS_DIR) test_out_dir = $$OUT_PWD/$$basename(QMAKE_CONFIG_TESTS_DIR)
test_cmd_base = "$$QMAKE_CD $$system_quote($$system_path($$test_out_dir)) &&" test_cmd_base = "$$QMAKE_CD $$system_quote($$system_path($$test_out_dir)) &&"
conftest = "int main() { return 0; }" conftest = "int main() { return 0; }"
@ -849,7 +849,7 @@ defineTest(qtConfTest_compile) {
isEmpty(host): host = false isEmpty(host): host = false
test_dir = $$QMAKE_CONFIG_TESTS_DIR/$$test test_dir = $$QMAKE_CONFIG_TESTS_DIR/$$test
test_base_out_dir = $$shadowed($$QMAKE_CONFIG_TESTS_DIR) test_base_out_dir = $$OUT_PWD/$$basename(QMAKE_CONFIG_TESTS_DIR)
test_out_dir = $$test_base_out_dir/$$test test_out_dir = $$test_base_out_dir/$$test
!isEmpty($${1}.pro): \ !isEmpty($${1}.pro): \
test_dir = $$test_dir/$$eval($${1}.pro) test_dir = $$test_dir/$$eval($${1}.pro)