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	Doc: Update out-of-date screenshots in example docs	2018-08-16 10:12:21 +00:00
src	Merge remote-tracking branch 'origin/5.12' into dev	2019-06-25 13:04:27 +02:00
dropsite.qdoc	DropSite example: fix documentation	2018-12-10 18:38:56 +00:00
mousebuttons.qdoc	Unify license header usage.	2016-03-29 10:20:03 +00:00