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
..
dialogs	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
effects	Revert "QWidgetEffectSourcePrivate::draw(): Call render() when no shared painter exists"	2017-06-14 13:00:35 +00:00
graphicsview	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
itemviews	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
kernel	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
styles	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
util	QCompleter: Send activated() signal only once on return key	2017-09-22 00:02:06 +00:00
widgets	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
widgets.pro	Move QGestureRecognizer test to widgets/kernel	2017-06-02 18:36:11 +00:00