Merge remote-tracking branch 'origin/5.13' into dev

 Conflicts:
	src/corelib/configure.json

Change-Id: I93ac67f3bf4844bc7c691183e94bceb922b7b919

1 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/platforms/wasm/qwasmeventtranslator.cpp b/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
index 63a764e741..1c4c8cb7e8 100644
--- a/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
+++ b/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
@@ -316,8 +316,8 @@ static void mouseWheelEvent(emscripten::val event) {
     }
 }
 
-EMSCRIPTEN_BINDINGS(mouse_module) {
-    function("mouseWheelEvent", &mouseWheelEvent);
+EMSCRIPTEN_BINDINGS(qtMouseModule) {
+    function("qtMouseWheelEvent", &mouseWheelEvent);
 }
 
 QWasmEventTranslator::QWasmEventTranslator(QWasmScreen *screen)
@@ -358,7 +358,7 @@ void QWasmEventTranslator::initEventHandlers()
 
             emscripten::val::global(canvasId).call<void>("addEventListener",
                                                          std::string("wheel"),
-                                                         val::module_property("mouseWheelEvent"));
+                                                         val::module_property("qtMouseWheelEvent"));
         }
     }