diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-15 18:23:05 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-08-10 15:42:45 +0000 |
| commit | 9987b1dc692e257964e64e4b0cea702dd8408efb (patch) | |
| tree | 39dd31e24de04516b7ef5b13ab0741a6b8d22930 /configure.pri | |
| parent | 52b3a81865a39a69dce969bd24327ba89180e116 (diff) | |
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>
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 6 |
1 files 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.") |