summaryrefslogtreecommitdiffstats
path: root/src/network/socket
diff options
context:
space:
mode:
authorMarkus Goetz <Markus.Goetz@nokia.com>2010-05-06 07:57:19 (GMT)
committerMarkus Goetz <Markus.Goetz@nokia.com>2010-05-06 07:57:19 (GMT)
commitefb26a325dcea5e60d7801fef00e650bd028c16d (patch)
treec68dc9c3efcc63a4a8197984d39e93ec0cf033a0 /src/network/socket
parent4620b0fc7a48c643400a42eb9e9cc0a82ad0be9a (diff)
downloadQt-efb26a325dcea5e60d7801fef00e650bd028c16d.zip
Qt-efb26a325dcea5e60d7801fef00e650bd028c16d.tar.gz
Qt-efb26a325dcea5e60d7801fef00e650bd028c16d.tar.bz2
QTcpServer: Fix documentation for previous commit
Diffstat (limited to 'src/network/socket')
-rw-r--r--src/network/socket/qtcpserver.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/socket/qtcpserver.cpp b/src/network/socket/qtcpserver.cpp
index a259eee..55f926d 100644
--- a/src/network/socket/qtcpserver.cpp
+++ b/src/network/socket/qtcpserver.cpp
@@ -562,7 +562,7 @@ QTcpSocket *QTcpServer::nextPendingConnection()
to the other thread and create the QTcpSocket object there and
use its setSocketDescriptor() method.
- \sa newConnection(), nextPendingConnection()
+ \sa newConnection(), nextPendingConnection(), addPendingConnection()
*/
void QTcpServer::incomingConnection(int socketDescriptor)
{
@@ -584,6 +584,7 @@ void QTcpServer::incomingConnection(int socketDescriptor)
Pending Connections mechanism.
\sa incomingConnection()
+ \since 4.7
*/
void QTcpServer::addPendingConnection(QTcpSocket* socket)
{