Changeset 769 for trunk/src/network/socket/qnativesocketengine.cpp

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/network/socket/qnativesocketengine.cpp (modified) (1 diff)

trunk/src/network/socket/qnativesocketengine.cpp

@@ -780 +780 @@
         return -1;
     } else if (readBytes == -1) {
-        d->setError(QAbstractSocket::NetworkError,
-                    QNativeSocketEnginePrivate::ReadErrorString);
+        if (!d->hasSetSocketError) {
+            d->hasSetSocketError = true;
+            d->socketError = QAbstractSocket::NetworkError;
+            d->socketErrorString = qt_error_string();
+        }
         close();
         return -1;