summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-05-06 07:26:40 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-05-06 07:26:40 (GMT)
commit6902c158d3857061865dc29aa519dab93d8e2f0c (patch)
tree3f668c36aaf028deacb9c7eab0e90ca6fbf0129d /src
parentfaf8ee9f32df224a14d864887ab53e8a832400f4 (diff)
downloadQt-6902c158d3857061865dc29aa519dab93d8e2f0c.zip
Qt-6902c158d3857061865dc29aa519dab93d8e2f0c.tar.gz
Qt-6902c158d3857061865dc29aa519dab93d8e2f0c.tar.bz2
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
Diffstat (limited to 'src')
-rw-r--r--src/corelib/kernel/qeventdispatcher_symbian.cpp5
1 files changed, 1 insertions, 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 )