Liang Qi 9bfe3ab71e Merge remote-tracking branch 'origin/5.8.0' into 5.8 ... Conflicts: doc/global/qt-cpp-defines.qdocconf src/plugins/platforms/android/qandroidplatformopenglcontext.h src/plugins/platforms/android/qandroidplatformtheme.h Change-Id: I13d51cc66f708138ff4d667ceea7d515992e58a4		2016-12-16 09:45:16 +01:00
..
image	Merge remote-tracking branch 'origin/5.7' into 5.8.0	2016-12-08 08:20:36 +01:00
itemmodels	QStandardItemModel: Reset the flags on clear()	2016-02-17 11:39:13 +00:00
kernel	rename QPointerUniqueId -> QPointingDeviceUniqueId	2016-12-07 13:20:51 +00:00
math3d	Updated license headers	2016-01-21 18:55:18 +00:00
painting	Fix qdrawhelper function toRGB64	2016-12-08 12:40:02 +00: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	Accept ZWNJ, ZWJ and PUA characters in input widgets	2016-12-12 11:13:53 +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