Liang Qi e5ac4afbf9 Merge remote-tracking branch 'origin/5.8' into dev ... Conflicts: mkspecs/features/mac/default_post.prf mkspecs/features/uikit/default_post.prf Change-Id: I2a6f783451f2ac9eb4c1a050f605435d2dacf218		2016-11-17 14:43:26 +01:00
..
image	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-16 12:35:36 +01:00
itemmodels	QStandardItemModel: Reset the flags on clear()	2016-02-17 11:39:13 +00:00
kernel	Merge remote-tracking branch 'origin/5.8' into dev	2016-11-17 14:43:26 +01:00
math3d	Updated license headers	2016-01-21 18:55:18 +00:00
painting	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-01 06:02:55 +01:00
qopengl	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-01 06:02:55 +01:00
qopenglconfig	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-25 16:12:11 +02:00
text	Merge remote-tracking branch 'origin/5.8' into dev	2016-11-17 14:43:26 +01: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