From 5dab77ba968ceac57efe108abd5c580d1df24d21 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 15 May 2017 14:14:28 +0200 Subject: build the configure tests in the top-level build dir 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 --- configure.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.pri') diff --git a/configure.pri b/configure.pri index 7d719e6797..76bb27e4ae 100644 --- a/configure.pri +++ b/configure.pri @@ -252,7 +252,7 @@ defineTest(qtConfTest_architecture) { error("Could not determine $$eval($${1}.label). See config.log for details.") 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): \ content = $$cat($$test_out_dir/arch, blob) else: win32:exists($$test_out_dir/arch.exe): \ -- cgit v1.2.3