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

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk

Files:

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

trunk/src/network/socket/qnativesocketengine.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -186 +186 @@
         // one exception: SocketError(11) bypasses this as it's purely
         // a temporary internal error condition.
+
+
+
         return;
     }
@@ -860 +863 @@
         d->setError(QAbstractSocket::SocketTimeoutError,
             QNativeSocketEnginePrivate::TimeOutErrorString);
+
         return false;
     } else if (state() == QAbstractSocket::ConnectingState) {
@@ -928 +932 @@
         d->setError(QAbstractSocket::SocketTimeoutError,
                     QNativeSocketEnginePrivate::TimeOutErrorString);
+
         return false;
     } else if (state() == QAbstractSocket::ConnectingState) {
@@ -979 +984 @@
         d->setError(QAbstractSocket::SocketTimeoutError,
                     QNativeSocketEnginePrivate::TimeOutErrorString);
+
         return false;
     } else if (state() == QAbstractSocket::ConnectingState) {