diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-16 01:01:29 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-16 01:01:30 +0100 |
| commit | 11b9c813e6705b0349e4c241f9132a6649977431 (patch) | |
| tree | 69df65cb06c9617ab305a55be413a6be63677913 /src/network | |
| parent | 8cc8eb8f24b9d297a25c9841326c6fa8561cf80e (diff) | |
| parent | 4554fa7b191566df0a6c07e686c642c78eb88095 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ief0a0b754c104d5348fee9ee15e967bd37c526f8
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/ssl/qsslsocket.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index fa012866e6..4e6caf3edd 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -1128,8 +1128,8 @@ QList<QSslCertificate> QSslSocket::peerCertificateChain() const handshake phase begins. \sa QSslConfiguration::ciphers(), QSslConfiguration::setCiphers(), - QSslConfiguration::setDefaultCiphers(), - QSslConfiguration::defaultCiphers(), + QSslConfiguration::setCiphers(), + QSslConfiguration::ciphers(), QSslConfiguration::supportedCiphers() */ QSslCipher QSslSocket::sessionCipher() const @@ -1498,7 +1498,7 @@ QList<QSslCertificate> QSslSocket::caCertificates() const Each SSL socket's CA certificate database is initialized to the default CA certificate database. - \sa QSslConfiguration::defaultCaCertificates(), addCaCertificates(), + \sa QSslConfiguration::caCertificates(), addCaCertificates(), addDefaultCaCertificate() */ bool QSslSocket::addDefaultCaCertificates(const QString &path, QSsl::EncodingFormat encoding, @@ -1524,7 +1524,7 @@ void QSslSocket::addDefaultCaCertificate(const QSslCertificate &certificate) SSL socket's CA certificate database is initialized to the default CA certificate database. - \sa QSslConfiguration::defaultCaCertificates(), addCaCertificates() + \sa QSslConfiguration::caCertificates(), addCaCertificates() */ void QSslSocket::addDefaultCaCertificates(const QList<QSslCertificate> &certificates) { |