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
..
image	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-09-20 11:58:32 +02:00
itemmodels	Fix QStandardItem::setChild crash when passing a null pointer	2017-07-27 19:41:06 +00:00
kernel	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
math3d	Use qRadiansToDegrees() and qDegreesToRadians() more widely	2017-07-05 10:15:34 +00:00
painting	Merge remote-tracking branch 'origin/5.9' into dev	2017-07-13 16:36:10 -07:00
qopengl	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
qopenglconfig	Fix tst_QOpenGlConfig for platforms with builtin test data	2017-06-19 07:05:59 +00:00
qvulkan	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
text	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
util	GLSL 1.00 ES must be selected using "#version 100"	2017-08-04 11:19:30 +00:00
gui.pro	Basic Vulkan enablers	2017-03-17 16:12:03 +00:00