diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-13 09:46:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-13 09:46:17 +0200 |
| commit | 1dade1bd8ad13a16152aff36351ac570b5b9fdf6 (patch) | |
| tree | eafed5710b34c327a98381ca15fe1985a6487b10 /configure.pri | |
| parent | d45908e24292a41ff7838366b34be7340bf9fda5 (diff) | |
| parent | fb703aea697b12de4810deec9f8605fd062208bd (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
mkspecs/win32-clang-msvc/qmake.conf
src/corelib/tools/qlist.h
src/gui/painting/qcompositionfunctions.cpp
src/gui/painting/qtriangulator_p.h
src/gui/text/qfontengine_p.h
src/network/kernel/qhostinfo_p.h
src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
Done-With: Allan Sandfeld Jensen <allan.jensen@qt.io>
Change-Id: Ib8a0308cf77224c4fbdcf56778fdac4a43e37798
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/configure.pri b/configure.pri index 7b8dee0953..cbd11c2f67 100644 --- a/configure.pri +++ b/configure.pri @@ -286,37 +286,13 @@ defineTest(qtConfTest_architecture) { !qtConfTest_compile($${1}): \ error("Could not determine $$eval($${1}.label). See config.log for details.") - host = $$eval($${1}.host) - isEmpty(host): host = false - file_prefix = - exts = - - $$host { - equals(QMAKE_HOST.os, Windows): \ - exts = .exe - } else { - win32 { - exts = .exe - } else:android { - file_prefix = lib - exts = .so - } else:wasm { - exts = .wasm .o - } - } - test = $$eval($${1}.test) output = $$eval($${1}.output) test_out_dir = $$OUT_PWD/$$basename(QMAKE_CONFIG_TESTS_DIR)/$$test - test_out_file = - for(ext, exts) { - equals(ext, -): ext = - f = $$test_out_dir/$$file_prefix$$output$$ext - exists($$f) { - test_out_file = $$f - break() - } - } - isEmpty(test_out_file): \ + test_out_file = $$test_out_dir/$$cat($$test_out_dir/$${output}.target.txt) + exists($$test_out_file): \ + content = $$cat($$test_out_file, blob) + else: \ error("$$eval($${1}.label) detection binary not found.") content = $$cat($$test_out_file, blob) |