Liang Qi 0fc569184c Merge remote-tracking branch 'origin/5.8' into 5.9 ... Conflicts: src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase.cpp src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp src/widgets/widgets/qtabbar.cpp Change-Id: Iaa9daee5f7a6490d56257a3824730a35751ceb05		2017-04-06 14:16:31 +02:00
..
image	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-03-13 15:55:44 +01:00
itemmodels	QStandardItemModel: Reset the flags on clear()	2016-02-17 11:39:13 +00:00
kernel	Skip OpenGL tests on platforms that don't support OpenGL	2017-04-04 11:06:38 +00:00
math3d	Updated license headers	2016-01-21 18:55:18 +00:00
painting	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-04-06 14:16:31 +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
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	Clean up some conditions in our pro files	2016-11-14 19:22:17 +00:00