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
..
android	…
bic/data	Add binary compatibility files for 5.12 for QtBase	2018-12-21 19:42:57 +00:00
cmake	cmake: correct version dependency for qt5_add_big_resources	2019-05-20 12:49:37 +02:00
concurrent	…
corelib	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-08-12 13:23:11 +02:00
dbus	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-02-19 01:00:08 +01:00
gui	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-08-12 13:23:11 +02:00
guiapplauncher	…
installed_cmake	…
network	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-08-08 01:00:08 +02:00
opengl	qWaitFor: Prevent being stuck in QCoreApplication::processEvents	2019-01-09 18:10:54 +00:00
other	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-06-20 07:50:44 +02:00
printsupport	tst_QPrinter: stabilize qprinter test	2019-01-20 13:39:54 +00:00
shared	Make tst_qwidget pass on High-DPI screens (Windows)	2019-06-03 10:41:08 +02:00
sql	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-02-21 01:00:08 +01:00
testlib	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-05-09 13:06:11 +00:00
tools	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-05-12 01:00:08 +02:00
widgets	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-08-12 13:23:11 +02:00
xml	…
auto.pro	…
network-settings.h	Extend the default retry times of QtNetworkSettings::verifyConnection	2019-01-23 15:28:33 +00:00
testserver.pri	Disable Docker-based test servers on macOS temporarily	2019-02-06 22:04:54 +00:00