qt5base-lts/tests/auto/network/ssl
Liang Qi e918334045 Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	src/widgets/dialogs/qcolordialog.cpp
	src/widgets/dialogs/qfiledialog.cpp
	tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp

Change-Id: I34bc8a990f8f526889a95a5c7099ef557b9681ad
2016-09-28 11:51:35 +02:00
..
qasn1element Updated license headers 2016-01-21 18:55:18 +00:00
qsslcertificate Updated license headers 2016-01-21 18:55:18 +00:00
qsslcipher Updated license headers 2016-01-21 18:55:18 +00:00
qsslellipticcurve Updated license headers 2016-01-21 18:55:18 +00:00
qsslerror Updated license headers 2016-01-21 18:55:18 +00:00
qsslkey Updated license headers 2016-01-21 18:55:18 +00:00
qsslsocket Merge remote-tracking branch 'origin/5.6' into 5.7 2016-09-28 11:51:35 +02:00
qsslsocket_onDemandCertificates_member Updated license headers 2016-01-21 18:55:18 +00:00
qsslsocket_onDemandCertificates_static Updated license headers 2016-01-21 18:55:18 +00:00
ssl.pro Add SecureTransport based SSL backend for iOS and OS X 2015-02-02 14:02:56 +00:00