Liang Qi 4159ee8405 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: config.tests/unix/ptrsize.test configure src/corelib/global/qnamespace.h src/network/socket/qabstractsocket.cpp tests/auto/other/networkselftest/networkselftest.pro Change-Id: Ic78abb4a34f9068567cea876861d4220f5a07672		2015-11-04 20:18:14 +01:00
..
certificates	ssl: add test certificates with DSA and EC keys	2015-07-30 11:31:40 +00:00
more-certificates	QSslCertificate: blacklist NIC certificates from India	2014-07-09 21:30:11 +02:00
pkcs12	Move the PKCS#12 support from QSslSocket to QSslCertificate.	2014-05-14 11:08:01 +02:00
verify-certs	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
.gitignore	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
BLACKLIST	Disable tst_QSslCertificate::subjectAndIssuerAttributes completely	2015-10-29 10:13:57 +00:00
qsslcertificate.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
tst_qsslcertificate.cpp	tests/auto/network: Remove some placeholder formatting.	2015-10-19 12:38:28 +00:00