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
..
127-0-0-1-as-CN.crt
aspiriniks.ca.crt
bogus-ca.crt
bogus-ca.key
bogus-client.crt
bogus-client.key
bogus-server.crt
bogus-server.key
ca.crt
fake-login.live.com.key
fake-login.live.com.pem
fluke.cert
fluke.key
inter.crt
leaf.crt
leaf.key
qt-test-server-cacert.pem	SSL: Update an about-to-expire certificate	2019-06-24 15:18:47 +02:00
qt-test-server-cert.pem	Convert tst_QSslSocket to work with Docker	2019-03-11 15:38:58 +00:00
subjectAltNameIP.crt
xn--schufele-2za.crt