Liang Qi 305dd1b61f Merge remote-tracking branch 'origin/5.9' into 5.11 ... Conflicts: .qmake.conf src/corelib/animation/qvariantanimation.cpp src/corelib/global/qglobal.cpp src/corelib/global/qlogging.cpp src/corelib/io/qprocess_win.cpp src/corelib/json/qjsonarray.cpp src/corelib/tools/qsimd_p.h src/corelib/tools/qtimezoneprivate_p.h src/corelib/xml/qxmlstream_p.h src/gui/kernel/qsimpledrag.cpp src/gui/kernel/qsimpledrag_p.h src/plugins/generic/generic.pro src/plugins/platforms/cocoa/qcocoamenu.mm src/widgets/styles/qmacstyle_mac.mm tests/auto/concurrent/qtconcurrentmap/BLACKLIST tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/widgets/dialogs/qmessagebox/BLACKLIST Change-Id: I508d686cf20f7f8cc6a7119b9bc7c3bbb505c58e		2018-02-14 12:51:24 +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.9' into 5.11	2018-02-14 12:51:24 +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	Merge remote-tracking branch 'origin/5.10' into dev	2018-01-02 09:58:44 +01: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