From 9987b1dc692e257964e64e4b0cea702dd8408efb Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 15 Jul 2016 18:23:05 +0200 Subject: platform-scope the test executables the arch test is looking for this is clearer, and avoids potential false hits if the target OS is changed without cleaning the build dir first. Change-Id: If88f3c555740dc9ff559c172b4b005ed8bfb60ae Reviewed-by: Lars Knoll --- configure.pri | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.pri b/configure.pri index 4cc1640d6f..96b0d4ea56 100644 --- a/configure.pri +++ b/configure.pri @@ -59,11 +59,11 @@ defineTest(qtConfTest_architecture) { test = $$eval($${1}.test) test_out_dir = $$shadowed($$QMAKE_CONFIG_TESTS_DIR/$$test) - exists($$test_out_dir/arch): \ + unix:exists($$test_out_dir/arch): \ content = $$cat($$test_out_dir/arch, blob) - else: exists($$test_out_dir/arch.exe): \ + else: win32:exists($$test_out_dir/arch.exe): \ content = $$cat($$test_out_dir/arch.exe, blob) - else: exists($$test_out_dir/libarch.so): \ + else: android:exists($$test_out_dir/libarch.so): \ content = $$cat($$test_out_dir/libarch.so, blob) else: \ error("$$eval($${1}.description) detection binary not found.") -- cgit v1.2.3