Liang Qi 44c393f9b6 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		2019-08-12 13:23:11 +02:00
..
qmake-manual.qdoc	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-08-12 13:23:11 +02:00