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 d0a0a3c041 Merge remote-tracking branch 'origin/5.10' into dev 
Conflicts:
	examples/network/fortuneclient/client.cpp
	examples/network/fortuneserver/server.cpp
	src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h
	src/plugins/platforms/cocoa/qcocoabackingstore.h
	src/plugins/platforms/cocoa/qcocoaintegration.h
	src/plugins/platforms/cocoa/qcocoascreen.h
	src/plugins/platforms/ios/qiosbackingstore.h
	src/plugins/sqldrivers/oci/qsql_oci.cpp
	src/widgets/kernel/qwidgetwindow.cpp

Change-Id: Ia6dd2c52d4a691b671cf9a2ffca70deccece8f10
 		2017-10-17 10:34:24 +02:00
..
qasn1element QAsn1Element - fix toDateTime function 2017-07-18 13:09:16 +00:00
qsslcertificate Fix crash when reading a PKCS12 file with no private key 2017-08-17 06:43:49 +00:00
qsslcipher
…
qssldiffiehellmanparameters Remove remains of wince in .pro files 2017-07-03 05:32:51 +00:00
qsslellipticcurve
…
qsslerror
…
qsslkey Use qtConfig throughout in qtbase 2016-08-19 04:28:05 +00:00
qsslsocket Change qrand() to QRandomGenerator in the SSL backend 2017-09-30 18:08:13 +00:00
qsslsocket_onDemandCertificates_member tst_QSsl(longlongnamefollows) - fix a flakey auto-test 2017-10-03 16:37:30 +00:00
qsslsocket_onDemandCertificates_static Use qtConfig throughout in qtbase 2016-08-19 04:28:05 +00:00
ssl.pro remove redundant conditionals regarding ssl 2016-10-04 08:25:24 +00:00