Liang Qi 6b8f422c5e Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/io/qsettings.cpp src/corelib/itemmodels/qstringlistmodel.cpp tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03		2016-08-13 01:05:02 +02:00
..
image	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-13 01:05:02 +02:00
itemmodels	QStandardItemModel: Reset the flags on clear()	2016-02-17 11:39:13 +00:00
kernel	xcb: Send expose event while shrinking windows	2016-06-30 06:51:48 +00: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-08-10 17:43:13 +02:00
qopengl	Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev	2016-01-26 11:27:37 +00:00
qopenglconfig	Updated license headers	2016-01-21 18:55:18 +00:00
text	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-06 09:04:55 +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