Liang Qi bf58c70546 Merge remote-tracking branch 'origin/5.12' into dev ... Conflicts: src/corelib/io/qdir.cpp src/corelib/kernel/qtimer.cpp src/corelib/kernel/qtimer.h Done-With: Edward Welbourne <edward.welbourne@qt.io> Change-Id: I683d897760ec06593136d77955f8bc87fdef3f9f		2018-11-22 01:53:29 +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-22 01:53:29 +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-22 01:53:29 +01:00
mimetypes	QMimeDatabase: update freedesktop.org.xml to shared-mime-info 1.10	2018-11-13 11:16:11 +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	Merge remote-tracking branch 'origin/5.12' into dev	2018-11-22 01:53:29 +01:00
corelib.pro	Create corelib/serialization and move existing file formats into it	2018-01-26 20:59:50 +00:00