From e98f5de6e1a19e06cc9e94ea01ca27d9a65f8d70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Fri, 10 Dec 2021 11:30:34 +0100 Subject: [PATCH] wasm: add virtual processWindowSystemEvents() The QtCore event dispatcher will be used from QtGui as well. Add virtual function where window system events processing can be added. Pick-to: 6.3 Change-Id: Ia6eda9ae18b2e91189ef9f60b6621d19a83313de Reviewed-by: Lorn Potter --- src/corelib/kernel/qeventdispatcher_wasm.cpp | 6 ++++++ src/corelib/kernel/qeventdispatcher_wasm_p.h | 3 +++ 2 files changed, 9 insertions(+) diff --git a/src/corelib/kernel/qeventdispatcher_wasm.cpp b/src/corelib/kernel/qeventdispatcher_wasm.cpp index 588e62a5760..3732a745ce3 100644 --- a/src/corelib/kernel/qeventdispatcher_wasm.cpp +++ b/src/corelib/kernel/qeventdispatcher_wasm.cpp @@ -226,9 +226,15 @@ bool QEventDispatcherWasm::processEvents(QEventLoop::ProcessEventsFlags flags) hasPendingEvents = qGlobalPostedEventsCount() > 0; QCoreApplication::sendPostedEvents(); + processWindowSystemEvents(flags); return hasPendingEvents; } +void QEventDispatcherWasm::processWindowSystemEvents(QEventLoop::ProcessEventsFlags flags) +{ + Q_UNUSED(flags); +} + void QEventDispatcherWasm::registerSocketNotifier(QSocketNotifier *notifier) { if (!emscripten_is_main_runtime_thread()) { diff --git a/src/corelib/kernel/qeventdispatcher_wasm_p.h b/src/corelib/kernel/qeventdispatcher_wasm_p.h index 09de40a70ff..70437e836c5 100644 --- a/src/corelib/kernel/qeventdispatcher_wasm_p.h +++ b/src/corelib/kernel/qeventdispatcher_wasm_p.h @@ -86,6 +86,9 @@ public: void interrupt() override; void wakeUp() override; +protected: + virtual void processWindowSystemEvents(QEventLoop::ProcessEventsFlags flags); + private: bool isMainThreadEventDispatcher(); bool isSecondaryThreadEventDispatcher();