diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-07-19 01:32:27 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-07-19 01:32:27 (GMT) |
| commit | e2cb220eb67455f1041cf8ac863a5da4421ab424 (patch) | |
| tree | 830302d9d445e2c071afe59ff7bef0f0664440f5 /src/network/socket/qtcpserver.cpp | |
| parent | 5572ec653fe735c4f413195c1ef34382aa8c6105 (diff) | |
| parent | 53d3083eecf88a20bc36ada43942c7a18677af62 (diff) | |
| download | Qt-e2cb220eb67455f1041cf8ac863a5da4421ab424.zip Qt-e2cb220eb67455f1041cf8ac863a5da4421ab424.tar.gz Qt-e2cb220eb67455f1041cf8ac863a5da4421ab424.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/network/socket/qtcpserver.cpp')
| -rw-r--r-- | src/network/socket/qtcpserver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/socket/qtcpserver.cpp b/src/network/socket/qtcpserver.cpp index 55f926d..0640c7c 100644 --- a/src/network/socket/qtcpserver.cpp +++ b/src/network/socket/qtcpserver.cpp @@ -577,7 +577,7 @@ void QTcpServer::incomingConnection(int socketDescriptor) /*! This function is called by QTcpServer::incomingConnection() - to add a socket to the list of pending incoming connections. + to add the \a socket to the list of pending incoming connections. \note Don't forget to call this member from reimplemented incomingConnection() if you do not want to break the |