qt5base-lts/tests/auto/network/ssl
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
..
qasn1element Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qsslcertificate Merge remote-tracking branch 'origin/5.6' into dev 2015-11-04 20:18:14 +01:00
qsslcipher Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qsslellipticcurve Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qsslerror Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qsslkey tests/auto/network: Remove some placeholder formatting. 2015-10-19 12:38:28 +00:00
qsslsocket Merge remote-tracking branch 'origin/5.5' into dev 2015-08-06 10:54:01 +02:00
qsslsocket_onDemandCertificates_member Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qsslsocket_onDemandCertificates_static Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
ssl.pro Add SecureTransport based SSL backend for iOS and OS X 2015-02-02 14:02:56 +00:00