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 /config.tests | |
| 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 'config.tests')
| -rw-r--r-- | config.tests/arch/arch.pro | 1 | ||||
| -rw-r--r-- | config.tests/arch/arch_host.pro | 1 | ||||
| -rw-r--r-- | config.tests/arch/write_info.pri | 17 |
3 files changed, 19 insertions, 0 deletions
diff --git a/config.tests/arch/arch.pro b/config.tests/arch/arch.pro index 45a7eb33af..c607898b71 100644 --- a/config.tests/arch/arch.pro +++ b/config.tests/arch/arch.pro @@ -1 +1,2 @@ SOURCES = arch.cpp +include(write_info.pri) diff --git a/config.tests/arch/arch_host.pro b/config.tests/arch/arch_host.pro index cefdbc77ef..ea0d1fa572 100644 --- a/config.tests/arch/arch_host.pro +++ b/config.tests/arch/arch_host.pro @@ -1,2 +1,3 @@ option(host_build) SOURCES = arch.cpp +include(write_info.pri) diff --git a/config.tests/arch/write_info.pri b/config.tests/arch/write_info.pri new file mode 100644 index 0000000000..79f980c873 --- /dev/null +++ b/config.tests/arch/write_info.pri @@ -0,0 +1,17 @@ +targetinfofile = $$basename(_PRO_FILE_) +targetinfofile ~= s/pro$/target.txt/ + +win32 { + ext = .exe +} else:android { + file_prefix = lib + ext = .so +} else:wasm { + equals(WASM_OBJECT_FILES, 1): \ + ext = .o + else: \ + ext = .wasm +} + +content = $${file_prefix}$${TARGET}$${ext} +write_file($$OUT_PWD/$$targetinfofile, content) |