whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/network/ssl
History
Liang Qi 17198e03ab Merge remote-tracking branch 'origin/5.7' into dev 
Conflicts:
	qmake/doc/src/qmake-manual.qdoc
	src/corelib/global/qglobal.cpp
	src/corelib/tools/qstring.cpp
	src/network/socket/qabstractsocket.cpp
	src/network/socket/qnativesocketengine_unix.cpp
	src/plugins/platforms/eglfs/api/qeglfsglobal.h

Change-Id: Id5dfdbd30fa996f9b4b66a0b030b7d3b8c0ef288
 		2016-08-16 07:58:32 +02:00
..
qasn1element Updated license headers 2016-01-21 18:55:18 +00:00
qsslcertificate QtNetwork: Remove Windows CE. 2016-03-29 20:28:18 +00:00
qsslcipher QtNetwork: Remove Windows CE. 2016-03-29 20:28:18 +00:00
qssldiffiehellmanparameters QSslDiffieHellmanParameters: make fit for release 2016-08-12 12:33:07 +00:00
qsslellipticcurve QtNetwork: Remove Windows CE. 2016-03-29 20:28:18 +00:00
qsslerror QtNetwork: Remove Windows CE. 2016-03-29 20:28:18 +00:00
qsslkey Store QSslKey in specific key format to provide more details for key 2016-07-28 14:32:05 +00:00
qsslsocket Merge remote-tracking branch 'origin/5.7' into dev 2016-08-16 07:58:32 +02:00
qsslsocket_onDemandCertificates_member QtNetwork: Remove Windows CE. 2016-03-29 20:28:18 +00:00
qsslsocket_onDemandCertificates_static QtNetwork: Remove Windows CE. 2016-03-29 20:28:18 +00:00
ssl.pro Disable QSslDiffieHellmanParameters tests for QT_NO_SSL builds 2016-06-10 13:18:03 +00:00