Liang Qi 28628a5d5e Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/plugins/platforms/eglfs/qeglfshooks.cpp Change-Id: I483f0dbd876943b184803f0fe65a0c686ad75db2		2016-10-22 21:19:57 +02:00
..
image	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-08 17:15:55 +02:00
itemmodels	QStandardItemModel: Reset the flags on clear()	2016-02-17 11:39:13 +00:00
kernel	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-22 21:19:57 +02:00
math3d	Updated license headers	2016-01-21 18:55:18 +00:00
painting	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-13 15:18:02 +02:00
qopengl	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-17 11:02:54 +02: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.6' into 5.7	2016-10-22 21:19:57 +02:00
util	Updated license headers	2016-01-21 18:55:18 +00:00
gui.pro	Add qopenglconfig test.	2015-02-02 23:05:41 +00:00