diff options
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 4 | ||||
| -rw-r--r-- | src/network/socket/qnativesocketengine_p.h | 2 | ||||
| -rw-r--r-- | src/network/socket/qnativesocketengine_unix.cpp | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index c38152a..347fb72 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -1067,9 +1067,9 @@ void QAbstractSocketPrivate::_q_abortConnectionAttempt() #if defined(QABSTRACTSOCKET_DEBUG) qDebug("QAbstractSocketPrivate::_q_abortConnectionAttempt() (timed out)"); #endif - if (socketEngine) { + if (socketEngine) socketEngine->setWriteNotificationEnabled(false); - } + connectTimer->stop(); if (addresses.isEmpty()) { diff --git a/src/network/socket/qnativesocketengine_p.h b/src/network/socket/qnativesocketengine_p.h index 8f08365..6b1e8c3 100644 --- a/src/network/socket/qnativesocketengine_p.h +++ b/src/network/socket/qnativesocketengine_p.h @@ -62,7 +62,7 @@ #ifdef Q_OS_SYMBIAN #include <private/qeventdispatcher_symbian_p.h> -#include<unistd.h> +#include <unistd.h> #endif QT_BEGIN_NAMESPACE diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp index cf31832..efcaefd 100644 --- a/src/network/socket/qnativesocketengine_unix.cpp +++ b/src/network/socket/qnativesocketengine_unix.cpp @@ -673,9 +673,6 @@ bool QNativeSocketEnginePrivate::nativeListen(int backlog) int QNativeSocketEnginePrivate::nativeAccept() { int acceptedDescriptor = qt_safe_accept(socketDescriptor, 0, 0); -#if defined (QNATIVESOCKETENGINE_DEBUG) - qDebug("QNativeSocketEnginePrivate::nativeAccept() == %i", acceptedDescriptor); -#endif //check if we have vaild descriptor at all if(acceptedDescriptor > 0) { |