2 files changed, 13 insertions, 1 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_wasm.cpp b/src/corelib/kernel/qeventdispatcher_wasm.cpp
index f7edf3285f8..25a27a0c22b 100644
--- a/src/corelib/kernel/qeventdispatcher_wasm.cpp
+++ b/src/corelib/kernel/qeventdispatcher_wasm.cpp
@@ -150,6 +150,18 @@ bool QEventDispatcherWasm::isValidEventDispatcherPointer(QEventDispatcherWasm *e
 
 bool QEventDispatcherWasm::processEvents(QEventLoop::ProcessEventsFlags flags)
 {
+    // Accept the current event if event handling recurses / event loop is reentered,
+    // to prevent the browser from propagating it to other event handlers.
+    if (useAsyncify() && isMainThreadEventDispatcher()) {
+        auto control = QWasmSuspendResumeControl::get();
+        auto currentEvent = control->currentEvent();
+        if (!currentEvent.isUndefined() && currentEvent.instanceof(emscripten::val::global("Event"))) {
+            currentEvent.call<void>("preventDefault");
+            currentEvent.call<void>("stopPropagation");
+            control->setCurrentEvent(emscripten::val::undefined());
+        }
+    }
+
     emit awake();
 
     if (!useAsyncify() && isMainThreadEventDispatcher())
diff --git a/src/corelib/kernel/qeventdispatcher_wasm_p.h b/src/corelib/kernel/qeventdispatcher_wasm_p.h
index 674af85dac2..1946bf63ede 100644
--- a/src/corelib/kernel/qeventdispatcher_wasm_p.h
+++ b/src/corelib/kernel/qeventdispatcher_wasm_p.h
@@ -40,7 +40,6 @@ public:
     ~QEventDispatcherWasm();
 
     bool processEvents(QEventLoop::ProcessEventsFlags flags) override;
-    bool sendAllEvents(QEventLoop::ProcessEventsFlags flag);
 
     void registerTimer(Qt::TimerId timerId, Duration interval, Qt::TimerType timerType,
                        QObject *object) override final;
@@ -69,6 +68,7 @@ protected:
     virtual bool sendPostedEvents();
 
 private:
+    bool sendAllEvents(QEventLoop::ProcessEventsFlags flag);
     bool isMainThreadEventDispatcher();
     bool isSecondaryThreadEventDispatcher();
     bool isValidEventDispatcher();