Liang Qi bb0fec8057 Merge remote-tracking branch 'origin/5.10' into 5.11 ... Conflicts: src/corelib/corelib.pro src/corelib/global/qrandom.cpp src/network/access/qhttpnetworkrequest_p.h src/plugins/platforms/cocoa/qcocoamenu.mm src/plugins/platforms/cocoa/qcocoansmenu.mm src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/offscreen/qoffscreenintegration.h src/widgets/kernel/qaction.cpp src/widgets/widgets.pro Done-with: Andy Shaw <andy.shaw@qt.io> Change-Id: Ib01547cf4184023f19858ccf0ce7fb824fed2a8d		2018-02-15 10:14:11 +01:00
..
image	Merge remote-tracking branch 'origin/5.10' into 5.11	2018-02-15 10:14:11 +01:00
itemmodels	QListWidgetItem/QStandardItem: pass role to dataChanged() signal	2018-01-26 19:58:26 +00:00
kernel	Merge remote-tracking branch 'origin/5.9' into 5.11	2018-02-14 12:51:24 +01: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 5.11	2018-02-14 12:51:24 +01: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	Merge remote-tracking branch 'origin/5.9' into 5.11	2018-02-14 12:51:24 +01: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