diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-06 09:54:24 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-06 09:54:24 +0200 |
| commit | 3a76f74e888d62548d7a4e18bdce83c6bc80d6a2 (patch) | |
| tree | 6bb5205d97384e60aec5a66d93da4fb400f38fcf /src/network/socket | |
| parent | c3ad797d8af6a7f1cbd51553430393a4317a23b9 (diff) | |
| parent | 7a22950819d60545c0d6ac96b463badcf88ddbd0 (diff) | |
Merge remote-tracking branch 'mainline/master' into earth
Diffstat (limited to 'src/network/socket')
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 7af71ccc8b..cfb141398c 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -1877,7 +1877,7 @@ bool QAbstractSocket::waitForReadyRead(int msecs) } Q_ASSERT(d->socketEngine); - forever { + do { bool readyToRead = false; bool readyToWrite = false; if (!d->socketEngine->waitForReadOrWrite(&readyToRead, &readyToWrite, true, !d->writeBuffer.isEmpty(), @@ -1904,7 +1904,7 @@ bool QAbstractSocket::waitForReadyRead(int msecs) if (state() != ConnectedState) return false; - } + } while (qt_timeout_value(msecs, stopWatch.elapsed()) > 0); return false; } |