Liang Qi bb0fec8057 Merge remote-tracking branch 'origin/5.10' into 5.11 ... Conflicts: src/corelib/corelib.pro src/corelib/global/qrandom.cpp src/network/access/qhttpnetworkrequest_p.h src/plugins/platforms/cocoa/qcocoamenu.mm src/plugins/platforms/cocoa/qcocoansmenu.mm src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/offscreen/qoffscreenintegration.h src/widgets/kernel/qaction.cpp src/widgets/widgets.pro Done-with: Andy Shaw <andy.shaw@qt.io> Change-Id: Ib01547cf4184023f19858ccf0ce7fb824fed2a8d		2018-02-15 10:14:11 +01: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	Update the overflow functions to include qsizetype	2018-01-24 21:13:20 +00:00
io	Merge remote-tracking branch 'origin/5.9' into 5.11	2018-02-14 12:51:24 +01:00
itemmodels	QListWidgetItem/QStandardItem: pass role to dataChanged() signal	2018-01-26 19:58:26 +00:00
kernel	Merge remote-tracking branch 'origin/5.10' into 5.11	2018-02-15 10:14:11 +01:00
mimetypes	QMimeType: remove unwanted *.bin as preferredSuffix for octet-stream	2018-01-28 19:13:28 +00:00
plugin	QUuid: add a way to get the string form without the braces	2018-02-03 21:30:37 +00:00
serialization	Merge remote-tracking branch 'origin/5.9' into 5.11	2018-02-14 12:51:24 +01:00
statemachine	Fix crash in tst_QStateMachine::dontProcessSlotsWhenMachineIsNotRunning	2018-02-14 08:12:20 +00:00
thread	Tests: Raise minimum supported MSVC version to 2015	2018-01-04 20:23:25 +00:00
tools	Merge remote-tracking branch 'origin/5.9' into 5.11	2018-02-14 12:51:24 +01:00
corelib.pro	Create corelib/serialization and move existing file formats into it	2018-01-26 20:59:50 +00:00