Merge remote-tracking branch 'origin/dev' into wip/cmake

 Conflicts:
        src/corelib/Qt5CoreConfigExtras.cmake.in
        src/corelib/Qt5CoreMacros.cmake
        src/dbus/Qt5DBusConfigExtras.cmake.in
        src/widgets/Qt5WidgetsConfigExtras.cmake.in

Change-Id: Ib782f3b177c38b2cce83beebe15be9c0baa578f7

1 files changed, 3 insertions, 1 deletions

diff --git a/src/plugins/platforms/wasm/qwasmscreen.cpp b/src/plugins/platforms/wasm/qwasmscreen.cpp
index d50765e3fb..5e6f94b9ed 100644
--- a/src/plugins/platforms/wasm/qwasmscreen.cpp
+++ b/src/plugins/platforms/wasm/qwasmscreen.cpp
@@ -32,6 +32,8 @@
 #include "qwasmeventtranslator.h"
 #include "qwasmcompositor.h"
 #include "qwasmintegration.h"
+#include "qwasmstring.h"
+
 #include <emscripten/bind.h>
 #include <emscripten/val.h>
 
@@ -186,7 +188,7 @@ void QWasmScreen::updateQScreenAndCanvasRenderSize()
 
     QSizeF canvasSize = cssSize * devicePixelRatio();
     val document = val::global("document");
-    val canvas = document.call<val>("getElementById", val(canvasId.constData()));
+    val canvas = document.call<val>("getElementById", QWasmString::fromQString(m_canvasId));
 
     canvas.set("width", canvasSize.width());
     canvas.set("height", canvasSize.height());