Liang Qi 5d6073be27 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: mkspecs/linux-icc/qmake.conf mkspecs/macx-icc/qmake.conf mkspecs/win32-icc/qmake.conf src/gui/painting/qgrayraster.c Change-Id: Ib08c45ea3215be05f986ecb3e1f4b37d209aa775		2017-04-07 10:24:33 +02:00
..
image	Merge remote-tracking branch 'origin/5.9' into dev	2017-03-20 09:00:44 +01:00
itemmodels	QStandardItemModel: Reset the flags on clear()	2016-02-17 11:39:13 +00:00
kernel	Merge remote-tracking branch 'origin/5.9' into dev	2017-04-07 10:24:33 +02:00
math3d	Updated license headers	2016-01-21 18:55:18 +00:00
painting	Merge remote-tracking branch 'origin/5.9' into dev	2017-04-07 10:24:33 +02:00
qopengl	Skip OpenGL tests on platforms that don't support OpenGL	2017-04-04 11:06:38 +00:00
qopenglconfig	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-25 16:12:11 +02:00
qvulkan	Introduce QVulkanWindow	2017-03-22 15:40:57 +00:00
text	Ensure that tst_QFontDatabase::addAppFont() tests the whole path to an engine	2017-03-31 09:45:39 +00:00
util	Fix test for WinRT	2016-09-23 07:20:53 +00:00
gui.pro	Basic Vulkan enablers	2017-03-17 16:12:03 +00:00