Liang Qi aadfe7d634 Merge remote-tracking branch 'origin/5.10' into dev ... Conflicts: src/gui/kernel/qguiapplication.cpp src/platformsupport/input/libinput/qlibinputpointer.cpp src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h src/plugins/platforms/cocoa/qcocoawindow.h src/testlib/qtestsystem.h Change-Id: I5975ffb3261c2dd82fe02ec4e57df7c0950226c5		2017-09-26 16:14:54 +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	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00: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-09-26 16:14:54 +02:00
qopenglconfig	Fix tst_QOpenGlConfig for platforms with builtin test data	2017-06-19 07:05:59 +00:00
qvulkan	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00: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