Liang Qi f3b28e8021 Merge remote-tracking branch 'origin/5.12' into 5.13 ... Conflicts: qmake/generators/unix/unixmake2.cpp src/plugins/platforms/cocoa/qcocoawindow.mm Change-Id: Iba7aa7324f35543e0297a3680956420058cd3630		2019-08-05 09:28:48 +02:00
..
image	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-06-20 07:50:44 +02:00
itemmodels	Fix use of deprecated ItemDataRoles Background/TextColorRole	2018-11-05 21:58:37 +00:00
kernel	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-08-05 09:28:48 +02:00
math3d	Use qRadiansToDegrees() and qDegreesToRadians() more widely	2017-07-05 10:15:34 +00:00
painting	Fix assert in QPainterPath after clear()	2019-07-31 12:05:54 +02:00
qopengl	Fix OpenGL ES2 build on Linux	2019-02-15 12:58:12 +00:00
qopenglconfig	Fix tst_QOpenGlConfig for platforms with builtin test data	2017-06-19 07:05:59 +00:00
qvulkan	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
text	Handle multiple font-families in <font> face attribute	2019-07-03 13:21:14 +02:00
util	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-05-03 10:44:24 +02:00
gui.pro	winrt: Skip/blacklist failing opengl tests	2018-05-28 08:36:55 +00:00