Made posted events part of the round robin queue.

That means that posted events will only be sent once per event queue
iteration, just like timers. This helps prevent event starvation.

RevBy:    mread
AutoTest: Included
Task:     QTBUG-13743

3 files changed, 32 insertions, 6 deletions

diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp
index 5cc6ae3..4ac500f 100644
--- a/src/corelib/kernel/qeventdispatcher_symbian.cpp
+++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp
@@ -178,8 +178,7 @@ void QActiveObject::reactivateAndComplete()
 }
 
 QWakeUpActiveObject::QWakeUpActiveObject(QEventDispatcherSymbian *dispatcher)
-    : CActive(WAKE_UP_PRIORITY),
-      m_dispatcher(dispatcher)
+    : QActiveObject(WAKE_UP_PRIORITY, dispatcher)
 {
     CActiveScheduler::Add(this);
     iStatus = KRequestPending;
@@ -201,6 +200,9 @@ void QWakeUpActiveObject::DoCancel()
 
 void QWakeUpActiveObject::RunL()
 {
+    if (!okToRun())
+        return;
+
     iStatus = KRequestPending;
     SetActive();
     QT_TRYCATCH_LEAVING(m_dispatcher->wakeUpWasCalled());
diff --git a/src/corelib/kernel/qeventdispatcher_symbian_p.h b/src/corelib/kernel/qeventdispatcher_symbian_p.h
index bc42753..53afebe 100644
--- a/src/corelib/kernel/qeventdispatcher_symbian_p.h
+++ b/src/corelib/kernel/qeventdispatcher_symbian_p.h
@@ -95,7 +95,7 @@ private:
     int m_iterationCount;
 };
 
-class QWakeUpActiveObject : public CActive
+class QWakeUpActiveObject : public QActiveObject
 {
 public:
     QWakeUpActiveObject(QEventDispatcherSymbian *dispatcher);
@@ -106,9 +106,6 @@ public:
 protected:
     void DoCancel();
     void RunL();
-
-private:
-    QEventDispatcherSymbian *m_dispatcher;
 };
 
 struct SymbianTimerInfo : public QSharedData
diff --git a/tests/auto/qtimer/tst_qtimer.cpp b/tests/auto/qtimer/tst_qtimer.cpp
index f23d065..102308e 100644
--- a/tests/auto/qtimer/tst_qtimer.cpp
+++ b/tests/auto/qtimer/tst_qtimer.cpp
@@ -89,6 +89,7 @@ private slots:
     void recurseOnTimeoutAndStopTimer();
 
     void QTBUG13633_dontBlockEvents();
+    void postedEventsShouldNotStarveTimers();
 };
 
 class TimerHelper : public QObject
@@ -723,5 +724,31 @@ void tst_QTimer::QTBUG13633_dontBlockEvents()
     QVERIFY(t.total > 2);
 }
 
+class SlotRepeater : public QObject {
+    Q_OBJECT
+public:
+    SlotRepeater() {}
+
+public slots:
+    void repeatThisSlot()
+    {
+        QMetaObject::invokeMethod(this, "repeatThisSlot", Qt::QueuedConnection);
+    }
+};
+
+void tst_QTimer::postedEventsShouldNotStarveTimers()
+{
+    TimerHelper timerHelper;
+    QTimer timer;
+    connect(&timer, SIGNAL(timeout()), &timerHelper, SLOT(timeout()));
+    timer.setInterval(0);
+    timer.setSingleShot(false);
+    timer.start();
+    SlotRepeater slotRepeater;
+    slotRepeater.repeatThisSlot();
+    QTest::qWait(100);
+    QVERIFY(timerHelper.count > 5);
+}
+
 QTEST_MAIN(tst_QTimer)
 #include "tst_qtimer.moc"