Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits)
  Autotest: make the test valid for multiple Qt versions
  Cocoa: qfiledialog test spits out memory warnings
  Drawing fake buttons using QMacStyle+QStyleOptionViewItemV4 lead to crash.
  Don't use QDebug references. Instead, pass by value.
  QNativeSocketEngine: Set OS error strings on failed read()
  QNativeSocketEngine: Also handle unknown errors from socket engine
  Qt/Cocoa Event Dispatcher Problem in modal dialogs
  Cocoa: Usage of QMacCocoaAutoReleasePool makes CPU peak
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( a54fd11a3abcd6d9c858e8162e85fd1f3aa21db1 )
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 0bc66e2d86149e0fb6a33428e4f23ebfe83bfde4 )
  'test -e' is a bashism. It's not available in traditional sh.
  QFileNetworkReply: Use a QFileEngine
  Crash when deleting QMainWindow with native toolbar on Cocoa.
  QNativeSocketEngine_win: Don't mess with linger settings
  Cosmetic: move the "Alsa support..." line to a more appropriate place
  Doc: Fixed broken link.
  Doc: Added a warning about the Accelerated Graphics Driver example.
  Doc: Fixed installation information for Qt for Embedded Linux.
  fix copy-paste error
  minor optimization
  ...

1 files changed, 8 insertions, 0 deletions

diff --git a/src/network/socket/qnativesocketengine.cpp b/src/network/socket/qnativesocketengine.cpp
index 6e1df93..a890b3b 100644
--- a/src/network/socket/qnativesocketengine.cpp
+++ b/src/network/socket/qnativesocketengine.cpp
@@ -778,6 +778,14 @@ qint64 QNativeSocketEngine::read(char *data, qint64 maxSize)
                     QNativeSocketEnginePrivate::RemoteHostClosedErrorString);
         close();
         return -1;
+    } else if (readBytes == -1) {
+        if (!d->hasSetSocketError) {
+            d->hasSetSocketError = true;
+            d->socketError = QAbstractSocket::NetworkError;
+            d->socketErrorString = qt_error_string();
+        }
+        close();
+        return -1;
     }
     return readBytes;
 }