Liang Qi 166889ddcb Merge remote-tracking branch 'origin/5.12' into 5.13 ... Conflicts: src/corelib/kernel/qobject.cpp Change-Id: I8ca1163a1fa8072dcd16ea4426c58219149599fd		2019-05-02 09:39:31 +02: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 5.13	2019-02-19 01:00:08 +01:00
io	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-05-02 09:39:31 +02:00
itemmodels	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-03-26 08:27:02 +01:00
kernel	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-04-16 09:34:50 +02: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 5.13	2019-03-06 12:31:50 +01:00
serialization	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-03-26 08:27:02 +01:00
statemachine	tst_QStateMachine: Don't use unconditional waits	2018-04-04 07:07:40 +00:00
thread	Add cmdline feature to qmake	2019-02-18 07:12:14 +00:00
tools	Purge use of some deprecated methods from QDateTime tests	2019-04-23 17:31:21 +00:00
corelib.pro	Create corelib/serialization and move existing file formats into it	2018-01-26 20:59:50 +00:00