diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-28 09:03:39 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-28 09:03:39 (GMT) |
| commit | 5f444e7a1dd7f22b5546f5225e12355ec5cc4d57 (patch) | |
| tree | e90e3d59dfccc347691c7a62aa69fa01b1a94743 /src/network | |
| parent | a8b5aefc48d619c1fc0ff1e97c8e3a42baccb7c0 (diff) | |
| parent | 1583d643285641bf71e6a107331d788acca9850c (diff) | |
| download | Qt-5f444e7a1dd7f22b5546f5225e12355ec5cc4d57.zip Qt-5f444e7a1dd7f22b5546f5225e12355ec5cc4d57.tar.gz Qt-5f444e7a1dd7f22b5546f5225e12355ec5cc4d57.tar.bz2 | |
Merge remote branch 'origin/4.6' into core-4.6
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/ssl/qsslsocket.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index 608d772..cfa99c8 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -467,6 +467,9 @@ bool QSslSocket::setSocketDescriptor(int socketDescriptor, SocketState state, Op return retVal; } +/*! + \reimp +*/ void QSslSocket::setSocketOption(QAbstractSocket::SocketOption option, const QVariant &value) { Q_D(QSslSocket); @@ -474,6 +477,9 @@ void QSslSocket::setSocketOption(QAbstractSocket::SocketOption option, const QVa d->plainSocket->setSocketOption(option, value); } +/*! + \reimp +*/ QVariant QSslSocket::socketOption(QAbstractSocket::SocketOption option) { Q_D(QSslSocket); |