diff options
| author | Harald Fernengel <harald@trolltech.com> | 2009-06-15 14:49:10 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald@trolltech.com> | 2009-06-15 14:49:10 (GMT) |
| commit | e19b6451796d136f1b5796c3afc5fd5492f3dac0 (patch) | |
| tree | ebdd6df672a483d2afd88a1aab2570c29285e11e /src | |
| parent | 77a41bfb4f1ce5e3fa52412e72c69b4397011fc1 (diff) | |
| parent | ce409be66b8e62f36f210818e7fcaffcf29935ce (diff) | |
| download | Qt-e19b6451796d136f1b5796c3afc5fd5492f3dac0.zip Qt-e19b6451796d136f1b5796c3afc5fd5492f3dac0.tar.gz Qt-e19b6451796d136f1b5796c3afc5fd5492f3dac0.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qeventdispatcher_s60.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/kernel/qeventdispatcher_s60.cpp b/src/gui/kernel/qeventdispatcher_s60.cpp index fcf572e..51878df 100644 --- a/src/gui/kernel/qeventdispatcher_s60.cpp +++ b/src/gui/kernel/qeventdispatcher_s60.cpp @@ -70,12 +70,14 @@ bool QEventDispatcherS60::processEvents ( QEventLoop::ProcessEventsFlags flags ) m_noInputEvents = false; ret = sendDeferredInputEvents() || ret; } - + ret = QEventDispatcherSymbian::processEvents(flags) || ret; - + m_noInputEvents = oldNoInputEventsValue; } QT_CATCH (const std::exception& ex) { - CActiveScheduler::Current()->Error(qt_translateExceptionToSymbianError(ex)); +#ifndef QT_NO_EXCEPTIONS + CActiveScheduler::Current()->Error(qt_translateExceptionToSymbianError(ex)); +#endif } return ret; |