diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-26 16:03:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-26 16:03:35 (GMT) |
| commit | 0a1a3606b6a3f466b4e48c64ad30040c729c2ca9 (patch) | |
| tree | 2ea385d76008fdd9ec3fa397ae877838adc1fa99 /src/network | |
| parent | 2c0c3a213d44ad53023a507e19d18d1e5d359aec (diff) | |
| parent | e68210d2086fbdc8252298f8d7781bf84f73b6ab (diff) | |
| download | Qt-0a1a3606b6a3f466b4e48c64ad30040c729c2ca9.zip Qt-0a1a3606b6a3f466b4e48c64ad30040c729c2ca9.tar.gz Qt-0a1a3606b6a3f466b4e48c64ad30040c729c2ca9.tar.bz2 | |
Merge branch 4.6 into qt-4.7-from-4.6
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/socket/qlocalsocket_win.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp index 1e0bced..5b42578 100644 --- a/src/network/socket/qlocalsocket_win.cpp +++ b/src/network/socket/qlocalsocket_win.cpp @@ -322,9 +322,9 @@ bool QLocalSocketPrivate::completeAsyncRead() // buffer. We will read the remaining data in the next call. break; case ERROR_PIPE_NOT_CONNECTED: - setErrorString(QLatin1String("QLocalSocketPrivate::completeAsyncRead")); - // fall through + return false; default: + setErrorString(QLatin1String("QLocalSocketPrivate::completeAsyncRead")); return false; } } |