Liang Qi 18934bcb0c Merge remote-tracking branch 'origin/5.8' into 5.9 ... Conflicts: src/corelib/global/qglobal.cpp Change-Id: I375fa4afa662fa411a15f212ebd5f2f0dffdba7f		2017-04-18 10:46:22 +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	QMatrix4x4: fix aliasing problem in operator*=	2017-04-14 12:29:35 +00:00
painting	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-04-06 14:16:31 +02:00
qopengl	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-04-12 20:08:56 +02:00
qopenglconfig	Skip testing of QOpenGlConfig on platforms that don't support it	2017-04-12 08:36:39 +00:00
text	QTextDocument: improve import of DIV tags	2017-04-10 09:44:01 +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