From faf8ee9f32df224a14d864887ab53e8a832400f4 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Wed, 6 May 2009 10:19:40 +0300 Subject: Revert "Work around compiler bug on Nokia Metrowerks compiler." This reverts commit 493f3e7691614dc12aaae75915ee7e988937e393. The workaround is not needed anymore with Nokia X86 compiler budled with Carbide C++ v2.x --- src/corelib/kernel/qvariant.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index 870aba2..d7b7e3c 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -571,12 +571,7 @@ template T qvariant_cast(const QVariant &v) if (qvariant_cast_helper(v, QVariant::Type(vid), &t)) return t; } -#ifdef Q_CC_NOKIAX86 - T t; - return t; -#else return T(); -#endif } template -- cgit v0.12 From 6902c158d3857061865dc29aa519dab93d8e2f0c Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Wed, 6 May 2009 10:26:40 +0300 Subject: Revert "We do have bug in AO cancel mechanism, unfortunately it was too late" This reverts commit 6df549b218e27c3fcc648d16bfc2aa1df7643b79. This problem was fixed by commit 1a0fd473, so commit was possible to revert. Task: 246600 Fix problem in eventdispatcher destructor / Active object canceling --- src/corelib/kernel/qeventdispatcher_symbian.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp index f7605c8..3110e63 100644 --- a/src/corelib/kernel/qeventdispatcher_symbian.cpp +++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp @@ -502,15 +502,12 @@ void QEventDispatcherSymbian::closingDown() if (m_selectThread.isRunning()) { m_selectThread.stop(); } -/* - We do have bug in AO cancel mechanism, unfortunately it was too late - to fix it for Garden release. This has to be fixed after Garden, see task: 246600 + delete m_wakeUpAO; if (m_activeScheduler) { CActiveScheduler::Install(NULL); delete m_activeScheduler; } - */ } bool QEventDispatcherSymbian::processEvents ( QEventLoop::ProcessEventsFlags flags ) -- cgit v0.12 From e6485b618cc8126d361e41c8a2c7862f604498cc Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Wed, 6 May 2009 15:23:59 +0300 Subject: Added some debug information for nativeSelect in Symbian OS --- src/network/socket/qnativesocketengine_unix.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp index 0e0980c..e000e11 100644 --- a/src/network/socket/qnativesocketengine_unix.cpp +++ b/src/network/socket/qnativesocketengine_unix.cpp @@ -913,8 +913,8 @@ int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool selectForRead) co #ifdef Q_OS_SYMBIAN bool selectForExec = FD_ISSET(socketDescriptor, &fdexec); if(selectForExec) { - qWarning("nativeSelect (selectForRead %d, retVal %d) Unexpected expectfds ready in fd %d", - selectForRead, retval, socketDescriptor); + qWarning("nativeSelect (selectForRead %d, retVal %d, errno %d) Unexpected expectfds ready in fd %d", + selectForRead, retval, errno, socketDescriptor); } #endif @@ -973,12 +973,16 @@ int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool checkRead, bool c ret = qt_socket_select(socketDescriptor + 1, &fdread, &fdwrite, &fdexec, timeout < 0 ? 0 : &tv); bool selectForExec = FD_ISSET(socketDescriptor, &fdexec); if(selectForExec) { - qWarning("nativeSelect (checkRead %d, checkWrite %d, ret %d): Unexpected expectfds ready in fd %d", - checkRead, checkWrite, ret, socketDescriptor); - if(checkRead) + qWarning("nativeSelect (checkRead %d, checkWrite %d, ret %d, errno %d): Unexpected expectfds ready in fd %d", + checkRead, checkWrite, ret, errno, socketDescriptor); + if (checkRead) FD_SET(socketDescriptor, &fdread); - if(checkWrite) + if (checkWrite) FD_SET(socketDescriptor, &fdwrite); + + if ((ret == -1) && ( errno == ECONNREFUSED || errno == EPIPE )) + ret = 1; + } #endif if (ret != -1 || errno != EINTR) { -- cgit v0.12