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
..
certs	HTTP2 - autotest	2016-07-14 10:20:36 +00:00
http2.pro	Merge remote-tracking branch 'origin/5.11' into 5.12	2018-11-27 01:00:09 +01:00
http2srv.cpp	tst_http2 - extend 'singleRequest' test case	2019-04-09 04:08:01 +00:00
http2srv.h	tst_http2 - extend 'singleRequest' test case	2019-04-09 04:08:01 +00:00
tst_http2.cpp	Merge remote-tracking branch 'origin/5.12' into dev	2019-06-25 13:04:27 +02:00