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

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 <lars.knoll@qt.io>
bb10
Oswald Buddenhagen 2016-07-15 18:23:05 +02:00 committed by Lars Knoll
parent 52b3a81865
commit 9987b1dc69
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.pri
View File

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