Liang Qi ef37ab9970 Merge remote-tracking branch 'origin/5.12' into dev ... Conflicts: .qmake.conf src/gui/painting/qdrawhelper.cpp src/gui/text/qdistancefield.cpp src/gui/text/qdistancefield_p.h src/network/ssl/qsslsocket_openssl.cpp src/plugins/platforms/android/qandroidinputcontext.cpp src/widgets/styles/qstylesheetstyle.cpp Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io> Change-Id: Ia7daad21f077ea889898f17734ec46303e71fe6b		2019-06-25 13:04:27 +02:00
..
images	Purge sRGB chunks from PNGs in tests.	2016-03-29 08:39:43 +00:00
scripts	Fix raster paint error in path joins of tightly bending bezier curves	2019-06-14 11:02:35 +02:00
.gitignore
images.qrc
lancelot.pro	Do not always use argb32pm for subsurfaces	2017-05-31 18:53:57 +00:00
paintcommands.cpp	Fix manual lance test: avoid using deprecated api	2019-04-26 07:47:12 +00:00
paintcommands.h	Remove unused QRegExp include	2019-06-10 19:25:12 +00:00
tst_lancelot.cpp	Fix HDR format in QOpenGLFramebufferObject::toImage()	2018-06-06 10:48:36 +00:00