Schedule Symbian active objects with a round robin scheduler

Each call to QEventDispatcherSymbian::processEvents allows
pre-existing active objects with priority >=
CActive::EPriorityStandard to run once. Active objects with lower
priorities can only run if no higher priority active object has run.

Task-number: QTBUG-15019
Reviewed-by: Tom Sutcliffe
Reviewed-by: axis

1 files changed, 2 insertions, 32 deletions

diff --git a/src/gui/kernel/qeventdispatcher_s60.cpp b/src/gui/kernel/qeventdispatcher_s60.cpp
index 3f20c08084..fd2280ea6e 100644
--- a/src/gui/kernel/qeventdispatcher_s60.cpp
+++ b/src/gui/kernel/qeventdispatcher_s60.cpp
@@ -58,47 +58,17 @@ QtEikonEnv::~QtEikonEnv()
 
 void QtEikonEnv::RunL()
 {
-    QEventDispatcherS60 *dispatcher = qobject_cast<QEventDispatcherS60 *>(QAbstractEventDispatcher::instance());
-    if (!dispatcher) {
-        CEikonEnv::RunL();
-        return;
-    }
-
-    if (m_lastIterationCount != dispatcher->iterationCount()) {
-        m_hasAlreadyRun = false;
-        m_lastIterationCount = dispatcher->iterationCount();
-    }
-
-    if (m_hasAlreadyRun) {
-        // Fool the active scheduler into believing we are still waiting for events.
-        // The window server thinks we are not, however.
-        m_savedStatusCode = iStatus.Int();
-        iStatus = KRequestPending;
-        SetActive();
-        dispatcher->queueDeferredActiveObjectsCompletion();
-    } else {
-        m_hasAlreadyRun = true;
-        CEikonEnv::RunL();
-    }
+    CEikonEnv::RunL();
+    return;
 }
 
 void QtEikonEnv::DoCancel()
 {
-    complete();
-
     CEikonEnv::DoCancel();
 }
 
 void QtEikonEnv::complete()
 {
-    if (m_hasAlreadyRun) {
-        if (m_savedStatusCode != KRequestPending) {
-            TRequestStatus *status = &iStatus;
-            QEventDispatcherSymbian::RequestComplete(status, m_savedStatusCode);
-            m_savedStatusCode = KRequestPending;
-        }
-        m_hasAlreadyRun = false;
-    }
 }
 
 QEventDispatcherS60::QEventDispatcherS60(QObject *parent)