diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-07 19:44:38 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-07 19:44:38 (GMT) |
| commit | bc29732c7f0a56f0b3413e3eaf487aa56c49f8d6 (patch) | |
| tree | 91cebf29af4336d2010fe66460d586f605a72ab0 /src/network/ssl | |
| parent | 4f1d524f992b0df3626ab63c001345c96ccea766 (diff) | |
| parent | 0f9d642e105da1644f4ed846a696510f9a9f1daf (diff) | |
| download | Qt-bc29732c7f0a56f0b3413e3eaf487aa56c49f8d6.zip Qt-bc29732c7f0a56f0b3413e3eaf487aa56c49f8d6.tar.gz Qt-bc29732c7f0a56f0b3413e3eaf487aa56c49f8d6.tar.bz2 | |
Merge commit 'doc-team/4.7' into 4.7
Diffstat (limited to 'src/network/ssl')
| -rw-r--r-- | src/network/ssl/qsslconfiguration.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp index f8f67bb..1760b53 100644 --- a/src/network/ssl/qsslconfiguration.cpp +++ b/src/network/ssl/qsslconfiguration.cpp @@ -485,9 +485,10 @@ void QSslConfiguration::setCiphers(const QList<QSslCipher> &ciphers) /*! Returns this connection's CA certificate database. The CA certificate database is used by the socket during the handshake phase to - validate the peer's certificate. It can be moodified prior to the - handshake with addCaCertificate(), addCaCertificates(), and - setCaCertificates(). + validate the peer's certificate. It can be modified prior to the + handshake with setCaCertificates(), or with \l{QSslSocket}'s + \l{QSslSocket::}{addCaCertificate()} and + \l{QSslSocket::}{addCaCertificates()}. \sa setCaCertificates() */ |