Liang Qi 58437fb125 Merge remote-tracking branch 'origin/5.12' into dev ... Conflicts: src/corelib/serialization/qcborcommon.h src/corelib/tools/qlocale_data_p.h tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp Done-with: Edward Welbourne <edward.welbourne@qt.io> Change-Id: Ibed987f6d77a0294f78f67d78625237616082416		2018-11-10 11:38:40 +01:00
..
certs	QSslSocket: fix connection to a international domain name	2017-03-23 16:11:15 +00:00
.gitignore	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
BLACKLIST	qtbase: cleanup BLACKLIST files	2018-02-13 15:20:33 +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	Merge remote-tracking branch 'origin/5.12' into dev	2018-11-10 11:38:40 +01:00