whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Doc: replaced mentions of deprecated function 

setDefaultCaCertificates()
--> QSslConfiguration::defaultConfiguration().setCaCertificates()

Task-number: QTBUG-49119
Change-Id: I0b53165fe658bb7e459ad7a5960210fc6c91b916
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
bb10
Nico Vertriest 2015-10-30 15:52:55 +01:00 committed by Jędrzej Nowacki
parent 5bb679590e
commit 60bb802598
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/network/ssl/qsslsocket.cpp
View File

@ -131,19 +131,18 @@
before the handshake phase with setLocalCertificate() and
setPrivateKey().
\li The CA certificate database can be extended and customized with
addCaCertificate(), addCaCertificates(), setCaCertificates(),
addDefaultCaCertificate(), addDefaultCaCertificates(), and
setDefaultCaCertificates().
addCaCertificate(), addCaCertificates(), addDefaultCaCertificate(),
addDefaultCaCertificates(), and QSslConfiguration::defaultConfiguration().setCaCertificates().
\endlist
\note If available, root certificates on Unix (excluding OS X) will be
loaded on demand from the standard certificate directories. If
you do not want to load root certificates on demand, you need to call either
the static function setDefaultCaCertificates() before the first SSL handshake
is made in your application, (e.g. via
"QSslSocket::setDefaultCaCertificates(QSslSocket::systemCaCertificates());"),
or call setCaCertificates() on your QSslSocket instance prior to the SSL
handshake.
loaded on demand from the standard certificate directories. If you do not
want to load root certificates on demand, you need to call either
QSslConfiguration::defaultConfiguration().setCaCertificates() before the first
SSL handshake is made in your application (for example, via passing
QSslSocket::systemCaCertificates() to it), or call
QSslConfiguration::defaultConfiguration()::setCaCertificates() on your QSslSocket instance
prior to the SSL handshake.
For more information about ciphers and certificates, refer to QSslCipher and
QSslCertificate.