Liang Qi 794781e7cf Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/cocoa/qnsview_mouse.mm src/testlib/testlib.pro Change-Id: Ia0ce4243418fe6a485b0f290c67bd433b3b04ff2		2018-03-28 08:12:21 +02:00
..
animation	qtbase: cleanup BLACKLIST files	2018-02-13 15:20:33 +00:00
codecs	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
global	Fix thread_local test	2018-02-23 13:23:01 +00:00
io	Merge remote-tracking branch 'origin/5.11' into dev	2018-03-28 08:12:21 +02:00
itemmodels	QSFPM: Faster row removes	2018-03-13 09:42:36 +00:00
kernel	Merge remote-tracking branch 'origin/5.11' into dev	2018-03-28 08:12:21 +02:00
mimetypes	QMimeDatabase: fix regression in alias resolving	2018-02-28 22:17:58 +00:00
plugin	tst_QLibrary: Ensure installation order of testdata libs	2018-03-02 07:20:04 +00:00
serialization	JSON: remove braces from UUID text representations	2018-03-02 04:06:33 +00:00
statemachine	Fix crash in tst_QStateMachine::dontProcessSlotsWhenMachineIsNotRunning	2018-02-14 08:12:20 +00:00
thread	Merge remote-tracking branch 'origin/5.11' into dev	2018-03-21 08:59:26 +01:00
tools	Merge remote-tracking branch 'origin/5.11' into dev	2018-03-28 08:12:21 +02:00
corelib.pro	Create corelib/serialization and move existing file formats into it	2018-01-26 20:59:50 +00:00