Liang Qi 980567b3a3 Merge remote-tracking branch 'origin/5.12' into dev ... Conflicts: src/android/templates/AndroidManifest.xml tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp Change-Id: I4c9679e3a8ebba118fbf4772301ff8fde60455b9		2019-01-26 08:35:40 +01:00
..
certs	Ssl: Add support for IP-address in alternate subject name	2019-01-24 15:24:14 +00:00
.gitignore	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
BLACKLIST	tst_qsslsocket - blacklist several test temporarily	2019-01-24 20:38:14 +00:00
qsslsocket.pro	prune cargo-culted and obsolete winsock deps from autotests	2018-07-19 13:31:08 +00:00
ssl.tar.gz	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
tst_qsslsocket.cpp	tst_qsslsocket: Make an ALPN test available to other backends	2019-01-24 15:24:23 +00:00