Liang Qi 58437fb125 Merge remote-tracking branch 'origin/5.12' into dev ... Conflicts: src/corelib/serialization/qcborcommon.h src/corelib/tools/qlocale_data_p.h tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp Done-with: Edward Welbourne <edward.welbourne@qt.io> Change-Id: Ibed987f6d77a0294f78f67d78625237616082416		2018-11-10 11:38:40 +01:00
..
image	QImageWriter/QPNGHandler: Quality option should be CompressionRatio	2018-10-14 19:36:33 +00: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 dev	2018-11-06 01:00:56 +01:00
math3d	Use qRadiansToDegrees() and qDegreesToRadians() more widely	2017-07-05 10:15:34 +00:00
painting	QPainter cosmetic stroker: Fix painting error for FlatCap lines	2018-09-25 12:32:24 +00:00
qopengl	Implement support for 16bpc image formats	2018-08-11 14:12:48 +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	Merge remote-tracking branch 'origin/5.12' into dev	2018-11-10 11:38:40 +01:00
util	Texture file support: add mipmap reading to ktx handler	2018-09-12 08:41:38 +00:00
gui.pro	winrt: Skip/blacklist failing opengl tests	2018-05-28 08:36:55 +00:00