summaryrefslogtreecommitdiffstats
path: root/src/network/socket
diff options
context:
space:
mode:
authormread <qt-info@nokia.com>2009-08-18 13:19:32 (GMT)
committermread <qt-info@nokia.com>2009-08-18 13:19:32 (GMT)
commit3ba8f80b42297ecc7832a5cdbdb0d044b4ca4cb6 (patch)
tree892a27b5f55e979ee8719e605636291d9645d5f9 /src/network/socket
parent3de310886db6c6d2a069c2bc78ab90ade8a827a9 (diff)
parent235eddd33cc4a17113382a452c88f704684f3f92 (diff)
downloadQt-3ba8f80b42297ecc7832a5cdbdb0d044b4ca4cb6.zip
Qt-3ba8f80b42297ecc7832a5cdbdb0d044b4ca4cb6.tar.gz
Qt-3ba8f80b42297ecc7832a5cdbdb0d044b4ca4cb6.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/network/socket')
-rw-r--r--src/network/socket/qabstractsocket.cpp4
-rw-r--r--src/network/socket/qnativesocketengine_p.h2
-rw-r--r--src/network/socket/qnativesocketengine_unix.cpp3
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) {