diff options
| author | Peter Yard <peter.yard@nokia.com> | 2009-10-27 02:50:31 (GMT) |
|---|---|---|
| committer | Peter Yard <peter.yard@nokia.com> | 2009-10-27 02:50:31 (GMT) |
| commit | a4d475f6fa3da4c2127a3b7a8d1e4d5b3f1a02f0 (patch) | |
| tree | 90c25e22db37a1d1899521edff3007050047e83a /src/network | |
| parent | 21e2cde622078333cedb650d62cb17b2f91d02c7 (diff) | |
| parent | b5efa250a6706821cf9969752a8fd063d1f206d6 (diff) | |
| download | Qt-a4d475f6fa3da4c2127a3b7a8d1e4d5b3f1a02f0.zip Qt-a4d475f6fa3da4c2127a3b7a8d1e4d5b3f1a02f0.tar.gz Qt-a4d475f6fa3da4c2127a3b7a8d1e4d5b3f1a02f0.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 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 2c88130..1f93534 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); |