Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
  QLocalSocket/Win: do not emit error() when no error actually occurred
  Doc: fix typo

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;
         }
     }