Liang Qi 246799d8a7 Merge remote-tracking branch 'origin/5.8' into dev ... Conflicts: examples/network/network-chat/peermanager.cpp src/widgets/util/qsystemtrayicon.cpp src/widgets/util/qsystemtrayicon_qpa.cpp src/widgets/util/qsystemtrayicon_win.cpp src/widgets/util/qsystemtrayicon_x11.cpp Change-Id: I1c026df83818c0ccaf956980370e7522960627db		2017-01-30 12:46:20 +01:00
..
image	Use QImage::reinterpretAsFormat in QPixmap	2017-01-26 09:14:27 +00: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-12-16 16:38:33 +01:00
math3d	Updated license headers	2016-01-21 18:55:18 +00:00
painting	Merge remote-tracking branch 'origin/5.8' into dev	2016-12-13 09:39:20 +01:00
qopengl	Add support for OpenGL 3.2+ core profile contexts in QPainter	2017-01-23 11:34:05 +00: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	2017-01-30 12:46:20 +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