summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-07-23 12:52:50 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-07-23 12:52:50 (GMT)
commit4b25f1c8ac148c190dc150ee2bc97a6615fdf3b1 (patch)
treebac84e6e1da8d7c62cc2cd542bf85a9f0a069e4c /src
parent4b148a23d4c524ec0abc67415b596c6952c517a8 (diff)
parent1e25ea7f04a44c84562216e5d305eddd12e9b4d7 (diff)
downloadQt-4b25f1c8ac148c190dc150ee2bc97a6615fdf3b1.zip
Qt-4b25f1c8ac148c190dc150ee2bc97a6615fdf3b1.tar.gz
Qt-4b25f1c8ac148c190dc150ee2bc97a6615fdf3b1.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src')
-rw-r--r--src/network/socket/qabstractsocket.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index be90b96..290522c 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -1568,6 +1568,7 @@ bool QAbstractSocket::setSocketDescriptor(int socketDescriptor, SocketState sock
Sets the option \a option to the value described by \a value.
\sa socketOption()
+ \since 4.6
*/
void QAbstractSocket::setSocketOption(QAbstractSocket::SocketOption option, QVariant value)
{
@@ -1589,6 +1590,7 @@ void QAbstractSocket::setSocketOption(QAbstractSocket::SocketOption option, QVar
Returns the value of the \a option option.
\sa setSocketOption()
+ \since 4.6
*/
QVariant QAbstractSocket::socketOption(QAbstractSocket::SocketOption option)
{