wasm: Specify event targets by CSS selectors; Support emsdk >= 1.39.5

DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR is now on by default, which
means that functions like emscripten_set_keydown_callback() now expects
CSS selectors (e.g. "#canvas_id" instead of "canvas_id").

In addition, Module.canvas is no more. Add a deprecation warning in case
someone is setting it and expects Qt to use it. (qtloader.js sets
qtCanvasElements instead).

This bumps the minimum supported emsdk version to 1.39.5.

Change-Id: I38abb2a191076ea04581c29552657ee3e0b87dbc
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>

1 files changed, 12 insertions, 13 deletions

diff --git a/src/plugins/platforms/wasm/qwasmeventtranslator.cpp b/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
index 1ccac87afa..d515a8cd2f 100644
--- a/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
+++ b/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
@@ -339,8 +339,7 @@ QWasmEventTranslator::QWasmEventTranslator(QWasmScreen *screen)
 
 void QWasmEventTranslator::initEventHandlers()
 {
-    QByteArray _canvasId = screen()->canvasId().toUtf8();
-    const char *canvasId = _canvasId.constData();
+    QByteArray canvasSelector = "#" + screen()->canvasId().toUtf8();
 
     // The Platform Detect: expand coverage and move as needed
     enum Platform {
@@ -364,21 +363,21 @@ void QWasmEventTranslator::initEventHandlers()
         }
     }
 
-    emscripten_set_keydown_callback(canvasId, (void *)this, 1, &keyboard_cb);
-    emscripten_set_keyup_callback(canvasId, (void *)this, 1, &keyboard_cb);
+    emscripten_set_keydown_callback(canvasSelector.constData(), (void *)this, 1, &keyboard_cb);
+    emscripten_set_keyup_callback(canvasSelector.constData(), (void *)this, 1, &keyboard_cb);
 
-    emscripten_set_mousedown_callback(canvasId, (void *)this, 1, &mouse_cb);
-    emscripten_set_mouseup_callback(canvasId, (void *)this, 1, &mouse_cb);
-    emscripten_set_mousemove_callback(canvasId, (void *)this, 1, &mouse_cb);
+    emscripten_set_mousedown_callback(canvasSelector.constData(), (void *)this, 1, &mouse_cb);
+    emscripten_set_mouseup_callback(canvasSelector.constData(), (void *)this, 1, &mouse_cb);
+    emscripten_set_mousemove_callback(canvasSelector.constData(), (void *)this, 1, &mouse_cb);
 
-    emscripten_set_focus_callback(canvasId, (void *)this, 1, &focus_cb);
+    emscripten_set_focus_callback(canvasSelector.constData(), (void *)this, 1, &focus_cb);
 
-    emscripten_set_wheel_callback(canvasId, (void *)this, 1, &wheel_cb);
+    emscripten_set_wheel_callback(canvasSelector.constData(), (void *)this, 1, &wheel_cb);
 
-    emscripten_set_touchstart_callback(canvasId, (void *)this, 1, &touchCallback);
-    emscripten_set_touchend_callback(canvasId, (void *)this, 1, &touchCallback);
-    emscripten_set_touchmove_callback(canvasId, (void *)this, 1, &touchCallback);
-    emscripten_set_touchcancel_callback(canvasId, (void *)this, 1, &touchCallback);
+    emscripten_set_touchstart_callback(canvasSelector.constData(), (void *)this, 1, &touchCallback);
+    emscripten_set_touchend_callback(canvasSelector.constData(), (void *)this, 1, &touchCallback);
+    emscripten_set_touchmove_callback(canvasSelector.constData(), (void *)this, 1, &touchCallback);
+    emscripten_set_touchcancel_callback(canvasSelector.constData(), (void *)this, 1, &touchCallback);
 }
 
 template <typename Event>