summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
diff options
context:
space:
mode:
authorAlex Trotsenko <alex1973tr@gmail.com>2020-08-18 15:07:38 +0300
committerAlex Trotsenko <alex1973tr@gmail.com>2020-08-26 11:08:15 +0300
commitfe4b246446f721085946e399b96a42eccfcecca8 (patch)
treefebdd856dfafc56530b5dfb132aad5c1deba474b /tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
parent5449bddb045519acc49dc2171938526457055c95 (diff)
Synchronize QEventDispatcherWin32::processEvents() with QCoreApplication
QCoreApplication has a special internal mechanism to control whether the event dispatcher should block after delivering the posted events. To handle queued connections in nested loops properly, we should use that functionality. Pick-to: 5.15 Fixes: QTBUG-85981 Change-Id: I124179a23b26a995cf95ed379e97bfa62c95f42a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp')
-rw-r--r--tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp26
1 files changed, 26 insertions, 0 deletions
diff --git a/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp b/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
index 85a2dae3b6..7aadd14466 100644
--- a/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
+++ b/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
@@ -67,6 +67,7 @@ private slots:
void sendPostedEvents_data();
void sendPostedEvents();
void processEventsOnlySendsQueuedEvents();
+ void postedEventsPingPong();
void eventLoopExit();
};
@@ -349,6 +350,31 @@ void tst_QEventDispatcher::processEventsOnlySendsQueuedEvents()
QCOMPARE(object.eventsReceived, 4);
}
+void tst_QEventDispatcher::postedEventsPingPong()
+{
+ QEventLoop mainLoop;
+
+ // We need to have at least two levels of nested loops
+ // for the posted event to get stuck (QTBUG-85981).
+ QMetaObject::invokeMethod(this, [this, &mainLoop]() {
+ QMetaObject::invokeMethod(this, [&mainLoop]() {
+ // QEventLoop::quit() should be invoked on the next
+ // iteration of mainLoop.exec().
+ QMetaObject::invokeMethod(&mainLoop, &QEventLoop::quit,
+ Qt::QueuedConnection);
+ }, Qt::QueuedConnection);
+ mainLoop.processEvents();
+ }, Qt::QueuedConnection);
+
+ // We should use Qt::CoarseTimer on Windows, to prevent event
+ // dispatcher from sending a posted event.
+ QTimer::singleShot(500, Qt::CoarseTimer, [&mainLoop]() {
+ mainLoop.exit(1);
+ });
+
+ QCOMPARE(mainLoop.exec(), 0);
+}
+
void tst_QEventDispatcher::eventLoopExit()
{
// This test was inspired by QTBUG-79477. A particular