diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-05-06 13:02:16 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-05-06 13:02:16 (GMT) |
| commit | 02795aeda1f064443bfc44db1539983b582220e6 (patch) | |
| tree | e90914278ddbfd88993d79cd13c75334e873f64e | |
| parent | 04330bc93d9ee9c389ae37a560e2b10c0d59024c (diff) | |
| parent | e6485b618cc8126d361e41c8a2c7862f604498cc (diff) | |
| download | Qt-02795aeda1f064443bfc44db1539983b582220e6.zip Qt-02795aeda1f064443bfc44db1539983b582220e6.tar.gz Qt-02795aeda1f064443bfc44db1539983b582220e6.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_symbian.cpp | 5 | ||||
| -rw-r--r-- | src/corelib/kernel/qvariant.h | 5 | ||||
| -rw-r--r-- | src/network/socket/qnativesocketengine_unix.cpp | 16 |
3 files changed, 11 insertions, 15 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 ) 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<typename T> 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<typename T> 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) { |