Liang Qi d0a0a3c041 Merge remote-tracking branch 'origin/5.10' into dev ... Conflicts: examples/network/fortuneclient/client.cpp examples/network/fortuneserver/server.cpp src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h src/plugins/platforms/cocoa/qcocoabackingstore.h src/plugins/platforms/cocoa/qcocoaintegration.h src/plugins/platforms/cocoa/qcocoascreen.h src/plugins/platforms/ios/qiosbackingstore.h src/plugins/sqldrivers/oci/qsql_oci.cpp src/widgets/kernel/qwidgetwindow.cpp Change-Id: Ia6dd2c52d4a691b671cf9a2ffca70deccece8f10		2017-10-17 10:34:24 +02:00
..
animation	Blacklist tst_QParallelAnimationGroup::deleteChildrenWithRunningGroup()	2017-06-19 18:33:47 +00:00
codecs	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
global	configure: make C++11 <random> a required functionality	2017-10-16 16:25:34 +00:00
io	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
itemmodels	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
json	Improve symmetry of variant json conversions	2017-07-25 09:00:46 +00:00
kernel	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
mimetypes	Merge remote-tracking branch 'origin/5.9' into dev	2017-05-29 10:54:41 +02:00
plugin	QUuid: add fromString(QStringView/QLatin1String)	2017-04-20 17:02:44 +00:00
statemachine	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
thread	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
tools	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
xml	QXmlStreamWriter: Avoid writing invalid characters	2017-09-13 07:29:00 +00:00
corelib.pro	Add support for Apple tvOS	2016-05-17 16:11:23 +00:00