diff options
author | Richard Moore <rich@kde.org> | 2012-05-06 18:03:02 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-06 19:12:43 +0200 |
commit | eee3798f6f69b99dbe0c6a95ca0a4011a8776c19 (patch) | |
tree | c3981e92851c3c8ce9634eac024f7fe2a8a3dc58 /src/network/ssl | |
parent | 54d9fd61e13f7369c831ab76503f7619d60c0cfd (diff) |
Fix more qdoc warnings in qtnetwork.
Change-Id: Ibfac6236e9f68b41e34e67ef03cfd590582439be
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/network/ssl')
-rw-r--r-- | src/network/ssl/qssl.cpp | 4 | ||||
-rw-r--r-- | src/network/ssl/qsslcertificateextension.cpp | 3 | ||||
-rw-r--r-- | src/network/ssl/qsslsocket.cpp | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp index 9a00b2a077..60679a201f 100644 --- a/src/network/ssl/qssl.cpp +++ b/src/network/ssl/qssl.cpp @@ -70,6 +70,10 @@ QT_BEGIN_NAMESPACE \value Rsa The RSA algorithm. \value Dsa The DSA algorithm. + \value Opaque A key that should be treated as a 'black box' by QSslKey. + + The opaque key facility allows applications to add support for facilities + such as PKCS#11 that Qt does not currently offer natively. */ /*! diff --git a/src/network/ssl/qsslcertificateextension.cpp b/src/network/ssl/qsslcertificateextension.cpp index 8a4e7409bf..fae261a258 100644 --- a/src/network/ssl/qsslcertificateextension.cpp +++ b/src/network/ssl/qsslcertificateextension.cpp @@ -133,6 +133,9 @@ QT_BEGIN_NAMESPACE +/*! + Constructs a QSslCertificateExtension. + */ QSslCertificateExtension::QSslCertificateExtension() : d(new QSslCertificateExtensionPrivate) { diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index 3445f13f39..6f031f241c 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -377,7 +377,8 @@ void QSslSocket::resume() Starts an encrypted connection to the device \a hostName on \a port, using \a mode as the \l OpenMode. This is equivalent to calling connectToHost() to establish the connection, followed by a - call to startClientEncryption(). + call to startClientEncryption(). The \a protocol parameter can be + used to specify which network protocol to use (eg. IPv4 or IPv6). QSslSocket first enters the HostLookupState. Then, after entering either the event loop or one of the waitFor...() functions, it |