qt5base-lts/tests/auto/network/ssl
Liang Qi 7c4b0aa970 Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	src/corelib/io/qstandardpaths_win.cpp
	src/plugins/platforms/ios/qioswindow.mm
	src/plugins/platforms/ios/quiview.mm
	tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp

Change-Id: I5deb0a0176a454a9c566e924d074ba60ce04f0bc
2017-11-23 12:52:18 +01: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 QtNetwork: Remove Windows CE. 2016-03-29 20:28:18 +00:00
qssldiffiehellmanparameters Remove remains of wince in .pro files 2017-07-03 05:32:51 +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 Use qtConfig throughout in qtbase 2016-08-19 04:28:05 +00:00
qsslsocket Merge remote-tracking branch 'origin/5.9' into 5.10 2017-11-23 12:52:18 +01: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