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/arch/arch.pro | |
| 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/arch/arch.pro')
| -rw-r--r-- | config.tests/arch/arch.pro | 1 |
1 files changed, 1 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) |