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

 Conflicts:
	src/widgets/kernel/qshortcut.cpp
	tests/auto/network/access/spdy/tst_spdy.cpp

Change-Id: If76c434beac2c0a393440aa365f89f77439774ce

1 files changed, 6 insertions, 3 deletions

diff --git a/src/plugins/platforms/wasm/qwasmscreen.cpp b/src/plugins/platforms/wasm/qwasmscreen.cpp
index b6c9b9e377..d50765e3fb 100644
--- a/src/plugins/platforms/wasm/qwasmscreen.cpp
+++ b/src/plugins/platforms/wasm/qwasmscreen.cpp
@@ -44,6 +44,7 @@
 #include <QtGui/qguiapplication.h>
 #include <private/qhighdpiscaling_p.h>
 
+using namespace emscripten;
 
 QT_BEGIN_NAMESPACE
 
@@ -184,13 +185,15 @@ void QWasmScreen::updateQScreenAndCanvasRenderSize()
     QSizeF cssSize(css_width, css_height);
 
     QSizeF canvasSize = cssSize * devicePixelRatio();
-    emscripten::val canvas = emscripten::val::global(canvasId.constData());
+    val document = val::global("document");
+    val canvas = document.call<val>("getElementById", val(canvasId.constData()));
+
     canvas.set("width", canvasSize.width());
     canvas.set("height", canvasSize.height());
 
     QPoint offset;
-    offset.setX(emscripten::val::global(canvasId.constData())["offsetTop"].as<int>());
-    offset.setY(emscripten::val::global(canvasId.constData())["offsetLeft"].as<int>());
+    offset.setX(canvas["offsetTop"].as<int>());
+    offset.setY(canvas["offsetLeft"].as<int>());
 
     emscripten::val rect = canvas.call<emscripten::val>("getBoundingClientRect");
     QPoint position(rect["left"].as<int>() - offset.x(), rect["top"].as<int>() - offset.y());