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
..
qaction	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
qactiongroup	Updated license headers	2016-01-21 18:55:18 +00:00
qapplication	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
qboxlayout	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
qdesktopwidget	Updated license headers	2016-01-21 18:55:18 +00:00
qformlayout	QFormLayout: take the correct row in takeRow()	2017-02-08 11:01:31 +00:00
qgesturerecognizer	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
qgridlayout	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
qlayout	tests/auto/widgets: use QCOMPARE(., nullptr)	2016-11-30 07:24:47 +00:00
qshortcut	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
qsizepolicy	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
qstackedlayout	Plug memleaks in tst_QStackedLayout	2017-01-14 18:17:47 +00:00
qtooltip	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
qwidget	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
qwidget_window	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
qwidgetaction	Updated license headers	2016-01-21 18:55:18 +00:00
qwidgetmetatype	Updated license headers	2016-01-21 18:55:18 +00:00
qwidgetsvariant	Updated license headers	2016-01-21 18:55:18 +00:00
qwindowcontainer	Fix crash when reparenting window container	2017-09-28 12:09:27 +00:00
kernel.pro	Move QGestureRecognizer test to widgets/kernel	2017-06-02 18:36:11 +00:00