diff options
author | Liang Qi <liang.qi@qt.io> | 2019-08-12 13:23:11 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-08-12 13:23:11 +0200 |
commit | 44c393f9b61797a240bfcbff1364ecdf7af41787 (patch) | |
tree | 94cca729399f5df23cf904f7bd866397d84aac7c /configure.pri | |
parent | ffc2d5722317fcab86865b11491d7bf7fef3e16d (diff) | |
parent | e66f247ccf345f1d303a92e53c21bb53d96c5af2 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
config.tests/arch/write_info.pri
Repair architecture config test for the WASM_OBJECT_FILES=1 build mode
configure.pri
tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
Done-With: Jörg Bornemann <joerg.bornemann@qt.io>
Change-Id: I9e12088356eb5bc65b53211cd7a8e330cccd1bb4
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) |