Liang Qi 58437fb125 Merge remote-tracking branch 'origin/5.12' into dev ... Conflicts: src/corelib/serialization/qcborcommon.h src/corelib/tools/qlocale_data_p.h tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp Done-with: Edward Welbourne <edward.welbourne@qt.io> Change-Id: Ibed987f6d77a0294f78f67d78625237616082416		2018-11-10 11:38:40 +01:00
..
animation	Extend blacklisting of tst_qparallelanimationgroup tests to macOS 10.13	2018-09-24 21:13:30 +00:00
codecs	Add tests for decoding too-short UTF-8 sequences	2018-09-25 22:14:07 +00:00
global	Merge remote-tracking branch 'origin/5.12' into dev	2018-11-01 01:01:28 +01:00
io	Merge remote-tracking branch 'origin/5.12' into dev	2018-11-01 01:01:28 +01:00
itemmodels	New proxy model: QTransposeProxyModel	2018-11-05 23:53:01 +00:00
kernel	Merge remote-tracking branch 'origin/5.12' into dev	2018-11-06 01:00:56 +01:00
mimetypes	QMimeType: Use default key as fallback for comment() property	2018-11-02 08:27:10 +00:00
plugin	Merge remote-tracking branch 'origin/5.12' into dev	2018-09-11 01:00:36 +02:00
serialization	Merge remote-tracking branch 'origin/5.12' into dev	2018-11-10 11:38:40 +01:00
statemachine	tst_QStateMachine: Don't use unconditional waits	2018-04-04 07:07:40 +00:00
thread	Re-enable thread autotests	2018-09-25 22:35:40 +00:00
tools	QByteArrayList: add indexOf(const char*) overload	2018-11-06 09:49:10 +00:00
corelib.pro	Create corelib/serialization and move existing file formats into it	2018-01-26 20:59:50 +00:00