qt5base-lts/tests/auto/network/ssl
Liang Qi 6b8f422c5e Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/io/qsettings.cpp
	src/corelib/itemmodels/qstringlistmodel.cpp
	tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp

Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03
2016-08-13 01:05:02 +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-08-13 01:05:02 +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