diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2014-08-18 21:09:04 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-08-19 00:42:00 +0200 |
commit | 75b62f3a172c277e8b90ef536da354deccb54d24 (patch) | |
tree | 2312151dfcaf678dc738062c3b85b32b67b51c44 /src/network | |
parent | 65240c602b2238f090118af816a2b051da7cf032 (diff) | |
parent | ca524e5b70ccfeb6386cf0c5df83ffb86a8771fe (diff) |
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/socket/qabstractsocket.cpp | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index bead45ab83..e572745d51 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -2008,6 +2008,9 @@ static int qt_timeout_value(int msecs, int elapsed) \note Multiple calls to this functions do not accumulate the time. If the function times out, the connecting process will be aborted. + \note This function may fail randomly on Windows. Consider using the event + loop and the connected() signal if your software will run on Windows. + \sa connectToHost(), connected() */ bool QAbstractSocket::waitForConnected(int msecs) @@ -2107,6 +2110,9 @@ bool QAbstractSocket::waitForConnected(int msecs) there is new data available for reading; otherwise it returns \c false (if an error occurred or the operation timed out). + \note This function may fail randomly on Windows. Consider using the event + loop and the readyRead() signal if your software will run on Windows. + \sa waitForBytesWritten() */ bool QAbstractSocket::waitForReadyRead(int msecs) @@ -2166,6 +2172,20 @@ bool QAbstractSocket::waitForReadyRead(int msecs) } /*! \reimp + + This function blocks until at least one byte has been written on the socket + and the \l{QIODevice::}{bytesWritten()} signal has been emitted. The + function will timeout after \a msecs milliseconds; the default timeout is + 30000 milliseconds. + + The function returns \c true if the bytesWritten() signal is emitted; + otherwise it returns \c false (if an error occurred or the operation timed + out). + + \note This function may fail randomly on Windows. Consider using the event + loop and the bytesWritten() signal if your software will run on Windows. + + \sa waitForReadyRead() */ bool QAbstractSocket::waitForBytesWritten(int msecs) { @@ -2247,6 +2267,9 @@ bool QAbstractSocket::waitForBytesWritten(int msecs) If msecs is -1, this function will not time out. + \note This function may fail randomly on Windows. Consider using the event + loop and the disconnected() signal if your software will run on Windows. + \sa disconnectFromHost(), close() */ bool QAbstractSocket::waitForDisconnected(int msecs) |