Allan Sandfeld Jensen fa9d12f4a2 Merge remote-tracking branch 'origin/5.10' into dev ... Conflicts: src/plugins/platforms/windows/qwindowsmousehandler.cpp src/plugins/platforms/xcb/qxcbimage.cpp tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/manual/qtabletevent/regular_widgets/main.cpp Done-with: Friedemann Kleint<Friedemann.Kleint@qt.io> Done-with: Mårten Nordheim<marten.nordheim@qt.io> Change-Id: I5b2499513a92c590ed0756f7d2e93c35a64b7f30		2017-10-24 13:40:55 +02:00
..
image	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-09-20 11:58:32 +02:00
itemmodels	Correct QStandardItemModel::setItemData to follow QAbstractItemModel	2017-10-17 12:28:23 +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-24 13:40:55 +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