Liang Qi 364b161122 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/widgets/widgets/qmainwindowlayout_p.h Change-Id: Id406a67606b885052ed405b0fbc8eea7d9d03224		2017-02-10 22:35:04 +01:00
..
image	Merge remote-tracking branch 'origin/5.9' into dev	2017-02-10 22:35:04 +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-12-16 16:38:33 +01:00
math3d	Updated license headers	2016-01-21 18:55:18 +00:00
painting	Tests: Fix Clang warnings about various unused variables	2017-02-05 10:54:28 +00: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	Accept error margin in QGlyphRun/QStaticText test for decorations	2017-02-02 15:10:41 +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