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 ea438b2508 Merge remote-tracking branch 'origin/5.7' into dev 
Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qsysinfo.h
	src/corelib/kernel/qcoreapplication_win.cpp
	src/gui/text/qdistancefield.cpp
	src/gui/text/qdistancefield_p.h
	src/plugins/platforms/windows/qwindowsglcontext.cpp
	src/plugins/platforms/windows/qwindowsglcontext.h

Change-Id: Ib3500acc2b28553bde06758cd9a2e19eb7fe2978
 		2016-06-21 08:39:41 +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 Disable QSslDiffieHellmanParameters tests for QT_NO_SSL builds 2016-06-10 13:18:03 +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 QtNetwork: Remove Windows CE. 2016-03-29 20:28:18 +00:00
qsslsocket Merge remote-tracking branch 'origin/5.7' into dev 2016-06-21 08:39:41 +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