16 files changed, 233 insertions, 56 deletions

diff --git a/src/plugins/platforms/wasm/qwasmbackingstore.cpp b/src/plugins/platforms/wasm/qwasmbackingstore.cpp
index 7e8a382512..a7423e9c47 100644
--- a/src/plugins/platforms/wasm/qwasmbackingstore.cpp
+++ b/src/plugins/platforms/wasm/qwasmbackingstore.cpp
@@ -31,7 +31,7 @@
 #include "qwasmwindow.h"
 #include "qwasmcompositor.h"
 
-#include <QtGui/qopengltexture.h>
+#include <QtOpenGL/qopengltexture.h>
 #include <QtGui/qmatrix4x4.h>
 #include <QtGui/qpainter.h>
 #include <private/qguiapplication_p.h>
diff --git a/src/plugins/platforms/wasm/qwasmclipboard.cpp b/src/plugins/platforms/wasm/qwasmclipboard.cpp
index d4a1e4dd50..f02c2c6ccb 100644
--- a/src/plugins/platforms/wasm/qwasmclipboard.cpp
+++ b/src/plugins/platforms/wasm/qwasmclipboard.cpp
@@ -29,6 +29,7 @@
 
 #include "qwasmclipboard.h"
 #include "qwasmwindow.h"
+#include "qwasmstring.h"
 
 #include <emscripten.h>
 #include <emscripten/html5.h>
@@ -40,22 +41,22 @@
 using namespace emscripten;
 
 // there has got to be a better way...
-static QByteArray g_clipboardArray;
-static QByteArray g_clipboardFormat;
+static QString g_clipboardText;
+static QString g_clipboardFormat;
 
 static val getClipboardData()
 {
-    return val(g_clipboardArray.constData());
+    return QWasmString::fromQString(g_clipboardText);
 }
 
 static val getClipboardFormat()
 {
-    return val(g_clipboardFormat.constData());
+    return QWasmString::fromQString(g_clipboardFormat);
 }
 
 static void pasteClipboardData(emscripten::val format, emscripten::val dataPtr)
 {
-    QString formatString = QString::fromStdString(format.as<std::string>());
+    QString formatString = QWasmString::toQString(format);
     QByteArray dataArray =  QByteArray::fromStdString(dataPtr.as<std::string>());
     QMimeData *mMimeData = new QMimeData;
     mMimeData->setData(formatString, dataArray);
@@ -102,11 +103,10 @@ static void qClipboardPasteTo(val event)
     bool hasClipboardApi = QWasmIntegration::get()->getWasmClipboard()->hasClipboardApi;
     val clipdata = hasClipboardApi ?
         val::global("Module").call<val>("qtGetClipboardData") :
-        event["clipboardData"].call<val>("getData", std::string("text"));
+        event["clipboardData"].call<val>("getData", val("text"));
 
-    const std::string data = clipdata.as<std::string>();
-    if (data.length() > 0) {
-        QString qstr = QString::fromStdString(data);
+    const QString qstr = QWasmString::toQString(clipdata);
+    if (qstr.length() > 0) {
         QMimeData *mMimeData = new QMimeData;
         mMimeData->setText(qstr);
         QWasmClipboard::qWasmClipboardPaste(mMimeData);
@@ -133,7 +133,7 @@ QWasmClipboard::QWasmClipboard()
 
 QWasmClipboard::~QWasmClipboard()
 {
-    g_clipboardArray.clear();
+    g_clipboardText.clear();
     g_clipboardFormat.clear();
 }
 
@@ -148,11 +148,11 @@ QMimeData* QWasmClipboard::mimeData(QClipboard::Mode mode)
 void QWasmClipboard::setMimeData(QMimeData* mimeData, QClipboard::Mode mode)
 {
     if (mimeData->hasText()) {
-        g_clipboardFormat = mimeData->formats().at(0).toUtf8();
-        g_clipboardArray = mimeData->text().toUtf8();
+        g_clipboardFormat = mimeData->formats().at(0);
+        g_clipboardText = mimeData->text();
     } else if (mimeData->hasHtml()) {
-        g_clipboardFormat =mimeData->formats().at(0).toUtf8();
-        g_clipboardArray = mimeData->html().toUtf8();
+        g_clipboardFormat = mimeData->formats().at(0);
+        g_clipboardText = mimeData->html();
     }
 
     QPlatformClipboard::setMimeData(mimeData, mode);
@@ -198,12 +198,14 @@ void QWasmClipboard::installEventHandlers(const QString &canvasId)
         return;
 
     // Fallback path for browsers which do not support direct clipboard access
-    val canvas = val::global(canvasId.toUtf8().constData());
-    canvas.call<void>("addEventListener", std::string("cut"),
+    val document = val::global("document");
+    val canvas = document.call<val>("getElementById", QWasmString::fromQString(canvasId));
+
+    canvas.call<void>("addEventListener", val("cut"),
                       val::module_property("qtClipboardCutTo"));
-    canvas.call<void>("addEventListener", std::string("copy"),
+    canvas.call<void>("addEventListener", val("copy"),
                       val::module_property("qtClipboardCopyTo"));
-    canvas.call<void>("addEventListener", std::string("paste"),
+    canvas.call<void>("addEventListener", val("paste"),
                       val::module_property("qtClipboardPasteTo"));
 }
 
@@ -224,6 +226,6 @@ void QWasmClipboard::writeTextToClipboard()
         val txt = module.call<val>("qtGetClipboardData");
         val format =  module.call<val>("qtGetClipboardFormat");
         val navigator = val::global("navigator");
-        navigator["clipboard"].call<void>("writeText", txt.as<std::string>());
+        navigator["clipboard"].call<void>("writeText", txt);
     }
 }
diff --git a/src/plugins/platforms/wasm/qwasmcompositor.cpp b/src/plugins/platforms/wasm/qwasmcompositor.cpp
index a810880c43..74890ead82 100644
--- a/src/plugins/platforms/wasm/qwasmcompositor.cpp
+++ b/src/plugins/platforms/wasm/qwasmcompositor.cpp
@@ -31,12 +31,11 @@
 #include "qwasmwindow.h"
 #include "qwasmstylepixmaps_p.h"
 
-#include <QtGui/qopengltexture.h>
+#include <QtOpenGL/qopengltexture.h>
 
 #include <QtGui/private/qwindow_p.h>
 #include <QtGui/qopenglcontext.h>
 #include <QtGui/qopenglfunctions.h>
-#include <QtGui/qopengltextureblitter.h>
 #include <QtGui/qoffscreensurface.h>
 #include <QtGui/qpainter.h>
 #include <private/qpixmapcache_p.h>
@@ -694,7 +693,7 @@ void QWasmCompositor::frame()
 
     if (m_context.isNull()) {
         m_context.reset(new QOpenGLContext());
-        //mContext->setFormat(mScreen->format());
+        m_context->setFormat(someWindow->window()->requestedFormat());
         m_context->setScreen(screen()->screen());
         m_context->create();
     }
diff --git a/src/plugins/platforms/wasm/qwasmcompositor.h b/src/plugins/platforms/wasm/qwasmcompositor.h
index 98f4a79b27..250d244c9f 100644
--- a/src/plugins/platforms/wasm/qwasmcompositor.h
+++ b/src/plugins/platforms/wasm/qwasmcompositor.h
@@ -33,8 +33,7 @@
 #include <QtGui/qregion.h>
 #include <qpa/qplatformwindow.h>
 
-#include <QtGui/qopengltextureblitter.h>
-#include <QtGui/qopengltexture.h>
+#include <QtOpenGL/qopengltextureblitter.h>
 #include <QtGui/qpalette.h>
 #include <QtGui/qpainter.h>
 
@@ -43,7 +42,7 @@ QT_BEGIN_NAMESPACE
 class QWasmWindow;
 class QWasmScreen;
 class QOpenGLContext;
-class QOpenGLTextureBlitter;
+class QOpenGLTexture;
 
 class QWasmCompositedWindow
 {
diff --git a/src/plugins/platforms/wasm/qwasmcursor.cpp b/src/plugins/platforms/wasm/qwasmcursor.cpp
index 2b3f37300d..616456b2fa 100644
--- a/src/plugins/platforms/wasm/qwasmcursor.cpp
+++ b/src/plugins/platforms/wasm/qwasmcursor.cpp
@@ -29,6 +29,7 @@
 
 #include "qwasmcursor.h"
 #include "qwasmscreen.h"
+#include "qwasmstring.h"
 
 #include <QtCore/qdebug.h>
 #include <QtGui/qwindow.h>
@@ -36,6 +37,8 @@
 #include <emscripten/emscripten.h>
 #include <emscripten/bind.h>
 
+using namespace emscripten;
+
 void QWasmCursor::changeCursor(QCursor *windowCursor, QWindow *window)
 {
     if (!windowCursor || !window)
@@ -54,9 +57,11 @@ void QWasmCursor::changeCursor(QCursor *windowCursor, QWindow *window)
         htmlCursorName = "auto";
 
     // Set cursor on the canvas
-    QString canvasId = QWasmScreen::get(screen)->canvasId();
-    emscripten::val canvasStyle = emscripten::val::global(canvasId.toUtf8().constData())["style"];
-    canvasStyle.set("cursor", emscripten::val(htmlCursorName.constData()));
+    val jsCanvasId = QWasmString::fromQString(QWasmScreen::get(screen)->canvasId());
+    val document = val::global("document");
+    val canvas = document.call<val>("getElementById", jsCanvasId);
+    val canvasStyle = canvas["style"];
+    canvasStyle.set("cursor", val(htmlCursorName.constData()));
 }
 
 QByteArray QWasmCursor::cursorShapeToHtml(Qt::CursorShape shape)
@@ -68,6 +73,7 @@ QByteArray QWasmCursor::cursorShapeToHtml(Qt::CursorShape shape)
         cursorName = "default";
         break;
     case Qt::UpArrowCursor:
+        cursorName = "n-resize";
         break;
     case Qt::CrossCursor:
         cursorName = "crosshair";
@@ -91,7 +97,8 @@ QByteArray QWasmCursor::cursorShapeToHtml(Qt::CursorShape shape)
         cursorName = "nwse-resize";
         break;
     case Qt::SizeAllCursor:
-        break; // no equivalent?
+        cursorName = "move";
+        break;
     case Qt::BlankCursor:
         cursorName = "none";
         break;
@@ -111,18 +118,23 @@ QByteArray QWasmCursor::cursorShapeToHtml(Qt::CursorShape shape)
         cursorName = "help";
         break;
     case Qt::BusyCursor:
-        cursorName = "wait";
+        cursorName = "progress";
         break;
     case Qt::OpenHandCursor:
-        break; // no equivalent?
+        cursorName = "grab";
+        break;
     case Qt::ClosedHandCursor:
-        break; // no equivalent?
+        cursorName = "grabbing";
+        break;
     case Qt::DragCopyCursor:
-        break; // no equivalent?
+        cursorName = "copy";
+        break;
     case Qt::DragMoveCursor:
-        break; // no equivalent?
+        cursorName = "default";
+        break;
     case Qt::DragLinkCursor:
-        break; // no equivalent?
+        cursorName = "alias";
+        break;
     default:
         break;
     }
diff --git a/src/plugins/platforms/wasm/qwasmeventdispatcher.cpp b/src/plugins/platforms/wasm/qwasmeventdispatcher.cpp
index 41355d72ae..ca8db9b215 100644
--- a/src/plugins/platforms/wasm/qwasmeventdispatcher.cpp
+++ b/src/plugins/platforms/wasm/qwasmeventdispatcher.cpp
@@ -33,6 +33,16 @@
 
 #include <emscripten.h>
 
+#if QT_CONFIG(thread)
+#if (__EMSCRIPTEN_major__ > 1 || __EMSCRIPTEN_minor__ > 38 || __EMSCRIPTEN_minor__ == 38 && __EMSCRIPTEN_tiny__ >= 22)
+#  define EMSCRIPTEN_HAS_ASYNC_RUN_IN_MAIN_RUNTIME_THREAD
+#endif
+#endif
+
+#ifdef EMSCRIPTEN_HAS_ASYNC_RUN_IN_MAIN_RUNTIME_THREAD
+#include <emscripten/threading.h>
+#endif
+
 class QWasmEventDispatcherPrivate : public QEventDispatcherUNIXPrivate
 {
 
@@ -179,3 +189,18 @@ void QWasmEventDispatcher::doMaintainTimers()
     emscripten_async_call(callback, this, toWaitDuration);
     m_currentTargetTime = newTargetTime;
 }
+
+void QWasmEventDispatcher::wakeUp()
+{
+#ifdef EMSCRIPTEN_HAS_ASYNC_RUN_IN_MAIN_RUNTIME_THREAD
+    if (!emscripten_is_main_runtime_thread())
+        emscripten_async_run_in_main_runtime_thread_(EM_FUNC_SIG_VI, (void*)(&QWasmEventDispatcher::mainThreadWakeUp), this);
+#endif
+    QEventDispatcherUNIX::wakeUp();
+}
+
+void QWasmEventDispatcher::mainThreadWakeUp(void *eventDispatcher)
+{
+    emscripten_resume_main_loop(); // Service possible requestUpdate Calls
+    static_cast<QWasmEventDispatcher *>(eventDispatcher)->processEvents(QEventLoop::AllEvents);
+}
diff --git a/src/plugins/platforms/wasm/qwasmeventdispatcher.h b/src/plugins/platforms/wasm/qwasmeventdispatcher.h
index 5300b3de73..f72d92ce07 100644
--- a/src/plugins/platforms/wasm/qwasmeventdispatcher.h
+++ b/src/plugins/platforms/wasm/qwasmeventdispatcher.h
@@ -51,6 +51,8 @@ public:
 protected:
     bool processEvents(QEventLoop::ProcessEventsFlags flags) override;
     void doMaintainTimers();
+    void wakeUp() override;
+    static void mainThreadWakeUp(void *eventDispatcher);
 
 private:
     bool m_hasMainLoop = false;
diff --git a/src/plugins/platforms/wasm/qwasmeventtranslator.cpp b/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
index ad94ba9c77..d99c202c48 100644
--- a/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
+++ b/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
@@ -32,6 +32,7 @@
 #include "qwasmcompositor.h"
 #include "qwasmintegration.h"
 #include "qwasmclipboard.h"
+#include "qwasmstring.h"
 
 #include <QtGui/qevent.h>
 #include <qpa/qwindowsysteminterface.h>
@@ -47,9 +48,10 @@
 
 #include <iostream>
 
-QT_BEGIN_NAMESPACE
 using namespace emscripten;
 
+QT_BEGIN_NAMESPACE
+
 typedef struct emkb2qt {
     const char *em;
     unsigned int qt;
@@ -353,10 +355,12 @@ void QWasmEventTranslator::initEventHandlers()
         g_useNaturalScrolling = false; // make this !default on macOS
 
         if (emscripten::val::global("window")["safari"].isUndefined()) {
-
-            emscripten::val::global(canvasId).call<void>("addEventListener",
-                                                         std::string("wheel"),
-                                                         val::module_property("qtMouseWheelEvent"));
+            val document = val::global("document");
+            val jsCanvasId = QWasmString::fromQString(screen()->canvasId());
+            val canvas = document.call<val>("getElementById", jsCanvasId);
+            canvas.call<void>("addEventListener",
+                              val("wheel"),
+                              val::module_property("qtMouseWheelEvent"));
         }
     }
 
@@ -544,7 +548,7 @@ void resizeWindow(QWindow *window, QWasmWindow::ResizeMode mode,
 
 void QWasmEventTranslator::processMouse(int eventType, const EmscriptenMouseEvent *mouseEvent)
 {
-    auto timestamp = mouseEvent->timestamp;
+    auto timestamp = emscripten_date_now();
     QPoint targetPoint(mouseEvent->targetX, mouseEvent->targetY);
     QPoint globalPoint = screen()->geometry().topLeft() + targetPoint;
 
@@ -670,7 +674,7 @@ int QWasmEventTranslator::wheel_cb(int eventType, const EmscriptenWheelEvent *wh
 
     QWasmEventTranslator *translator = (QWasmEventTranslator*)userData;
     Qt::KeyboardModifiers modifiers = translator->translateMouseEventModifier(&mouseEvent);
-    auto timestamp = mouseEvent.timestamp;
+    auto timestamp = emscripten_date_now();
     QPoint targetPoint(mouseEvent.targetX, mouseEvent.targetY);
     QPoint globalPoint = eventTranslator->screen()->geometry().topLeft() + targetPoint;
 
diff --git a/src/plugins/platforms/wasm/qwasmintegration.cpp b/src/plugins/platforms/wasm/qwasmintegration.cpp
index 1e9f68027c..ce83ad4e2f 100644
--- a/src/plugins/platforms/wasm/qwasmintegration.cpp
+++ b/src/plugins/platforms/wasm/qwasmintegration.cpp
@@ -36,10 +36,12 @@
 #include "qwasmclipboard.h"
 #include "qwasmservices.h"
 #include "qwasmoffscreensurface.h"
+#include "qwasmstring.h"
 
 #include "qwasmwindow.h"
 #ifndef QT_NO_OPENGL
 # include "qwasmbackingstore.h"
+# include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h>
 #endif
 #include "qwasmfontdatabase.h"
 #if defined(Q_OS_UNIX)
@@ -67,19 +69,19 @@ static void browserBeforeUnload(emscripten::val)
 
 static void addCanvasElement(emscripten::val canvas)
 {
-    QString canvasId = QString::fromStdString(canvas["id"].as<std::string>());
+    QString canvasId = QWasmString::toQString(canvas["id"]);
     QWasmIntegration::get()->addScreen(canvasId);
 }
 
 static void removeCanvasElement(emscripten::val canvas)
 {
-    QString canvasId = QString::fromStdString(canvas["id"].as<std::string>());
+    QString canvasId = QWasmString::toQString(canvas["id"]);
     QWasmIntegration::get()->removeScreen(canvasId);
 }
 
 static void resizeCanvasElement(emscripten::val canvas)
 {
-    QString canvasId = QString::fromStdString(canvas["id"].as<std::string>());
+    QString canvasId = QWasmString::toQString(canvas["id"]);
     QWasmIntegration::get()->resizeScreen(canvasId);
 }
 
@@ -115,11 +117,11 @@ QWasmIntegration::QWasmIntegration()
         int screenCount = qtCanvaseElements["length"].as<int>();
         for (int i = 0; i < screenCount; ++i) {
             emscripten::val canvas = qtCanvaseElements[i].as<emscripten::val>();
-            QString canvasId = QString::fromStdString(canvas["id"].as<std::string>());
+            QString canvasId = QWasmString::toQString(canvas["id"]);
             addScreen(canvasId);
         }
     } else if (!canvas.isUndefined()){
-        QString canvasId = QString::fromStdString(canvas["id"].as<std::string>());
+        QString canvasId = QWasmString::toQString(canvas["id"]);
         addScreen(canvasId);
     }
 
@@ -184,6 +186,7 @@ QPlatformBackingStore *QWasmIntegration::createPlatformBackingStore(QWindow *win
 #ifndef QT_NO_OPENGL
     QWasmCompositor *compositor = QWasmScreen::get(window->screen())->compositor();
     QWasmBackingStore *backingStore = new QWasmBackingStore(compositor, window);
+    backingStore->setOpenGLSupport(new QPlatformBackingStoreOpenGLSupport(backingStore));
     m_backingStores.insert(window, backingStore);
     return backingStore;
 #else
diff --git a/src/plugins/platforms/wasm/qwasmopenglcontext.cpp b/src/plugins/platforms/wasm/qwasmopenglcontext.cpp
index 62087f54bd..501ab99116 100644
--- a/src/plugins/platforms/wasm/qwasmopenglcontext.cpp
+++ b/src/plugins/platforms/wasm/qwasmopenglcontext.cpp
@@ -30,6 +30,7 @@
 #include "qwasmopenglcontext.h"
 #include "qwasmintegration.h"
 #include <EGL/egl.h>
+#include <emscripten/val.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -50,7 +51,13 @@ QWasmOpenGLContext::QWasmOpenGLContext(const QSurfaceFormat &format)
 QWasmOpenGLContext::~QWasmOpenGLContext()
 {
     if (m_context) {
+        // Destroy GL context. Work around bug in emscripten_webgl_destroy_context
+        // which removes all event handlers on the canvas by temporarily removing
+        // emscripten's JSEvents global object.
+        emscripten::val jsEvents = emscripten::val::global("window")["JSEvents"];
+        emscripten::val::global("window").set("JSEvents", emscripten::val::undefined());
         emscripten_webgl_destroy_context(m_context);
+        emscripten::val::global("window").set("JSEvents", jsEvents);
         m_context = 0;
     }
 }
@@ -99,7 +106,7 @@ EMSCRIPTEN_WEBGL_CONTEXT_HANDLE QWasmOpenGLContext::createEmscriptenContext(cons
     attributes.depth = useDepthStencil;
     attributes.stencil = useDepthStencil;
 
-    EMSCRIPTEN_WEBGL_CONTEXT_HANDLE context = emscripten_webgl_create_context(canvasId.toLocal8Bit().constData(), &attributes);
+    EMSCRIPTEN_WEBGL_CONTEXT_HANDLE context = emscripten_webgl_create_context(canvasId.toUtf8().constData(), &attributes);
 
     return context;
 }
diff --git a/src/plugins/platforms/wasm/qwasmscreen.cpp b/src/plugins/platforms/wasm/qwasmscreen.cpp
index e536bc0ee3..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>
 
@@ -44,6 +46,7 @@
 #include <QtGui/qguiapplication.h>
 #include <private/qhighdpiscaling_p.h>
 
+using namespace emscripten;
 
 QT_BEGIN_NAMESPACE
 
@@ -54,6 +57,8 @@ QWasmScreen::QWasmScreen(const QString &canvasId)
     m_compositor = new QWasmCompositor(this);
     m_eventTranslator = new QWasmEventTranslator(this);
     updateQScreenAndCanvasRenderSize();
+    emscripten::val canvas = emscripten::val::global(m_canvasId.toUtf8().constData());
+    canvas.call<void>("focus");
 }
 
 QWasmScreen::~QWasmScreen()
@@ -182,12 +187,18 @@ 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", QWasmString::fromQString(m_canvasId));
+
     canvas.set("width", canvasSize.width());
     canvas.set("height", canvasSize.height());
 
+    QPoint offset;
+    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>(), rect["top"].as<int>());
+    QPoint position(rect["left"].as<int>() - offset.x(), rect["top"].as<int>() - offset.y());
 
     setGeometry(QRect(position, cssSize.toSize()));
     m_compositor->redrawWindowContent();
diff --git a/src/plugins/platforms/wasm/qwasmservices.cpp b/src/plugins/platforms/wasm/qwasmservices.cpp
index 9328b8c065..4eee3fe972 100644
--- a/src/plugins/platforms/wasm/qwasmservices.cpp
+++ b/src/plugins/platforms/wasm/qwasmservices.cpp
@@ -28,6 +28,8 @@
 ****************************************************************************/
 
 #include "qwasmservices.h"
+#include "qwasmstring.h"
+
 #include <QtCore/QUrl>
 #include <QtCore/QDebug>
 
@@ -37,8 +39,8 @@ QT_BEGIN_NAMESPACE
 
 bool QWasmServices::openUrl(const QUrl &url)
 {
-    QByteArray utf8Url = url.toString().toUtf8();
-    emscripten::val::global("window").call<void>("open", emscripten::val(utf8Url.constData()), emscripten::val("_blank"));
+    emscripten::val jsUrl = QWasmString::fromQString(url.toString());
+    emscripten::val::global("window").call<void>("open", jsUrl, emscripten::val("_blank"));
     return true;
 }
 
diff --git a/src/plugins/platforms/wasm/qwasmstring.cpp b/src/plugins/platforms/wasm/qwasmstring.cpp
new file mode 100644
index 0000000000..05b571c459
--- /dev/null
+++ b/src/plugins/platforms/wasm/qwasmstring.cpp
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qwasmstring.h"
+
+QT_BEGIN_NAMESPACE
+
+using namespace emscripten;
+
+val QWasmString::fromQString(const QString &str)
+{
+    static const val UTF16ToString(
+        val::global("Module")["UTF16ToString"]);
+
+    auto ptr = quintptr(str.utf16());
+    return UTF16ToString(val(ptr));
+}
+
+QString QWasmString::toQString(const val &v)
+{
+    QString result;
+    if (!v.isString())
+        return result;
+
+    static const val stringToUTF16(
+        val::global("Module")["stringToUTF16"]);
+    static const val length("length");
+
+    result.resize(v[length].as<int>());
+    auto ptr = quintptr(result.utf16());
+    stringToUTF16(v, val(ptr));
+    return result;
+}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/wasm/qwasmstring.h b/src/plugins/platforms/wasm/qwasmstring.h
new file mode 100644
index 0000000000..de5da92830
--- /dev/null
+++ b/src/plugins/platforms/wasm/qwasmstring.h
@@ -0,0 +1,45 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#pragma once
+
+#include <qstring.h>
+
+#include <emscripten/val.h>
+
+QT_BEGIN_NAMESPACE
+
+class QWasmString
+{
+public:
+    static emscripten::val fromQString(const QString &str);
+    static QString toQString(const emscripten::val &v);
+};
+QT_END_NAMESPACE
+
diff --git a/src/plugins/platforms/wasm/wasm.pro b/src/plugins/platforms/wasm/wasm.pro
index f8c8175525..1aee4a3e58 100644
--- a/src/plugins/platforms/wasm/wasm.pro
+++ b/src/plugins/platforms/wasm/wasm.pro
@@ -4,6 +4,8 @@ QT += \
     core-private gui-private \
     eventdispatcher_support-private fontdatabase_support-private egl_support-private
 
+qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private
+
 # Avoid X11 header collision, use generic EGL native types
 DEFINES += QT_EGL_NO_X11
 
@@ -23,7 +25,8 @@ SOURCES = \
     qwasmtheme.cpp \
     qwasmclipboard.cpp \
     qwasmservices.cpp \
-    qwasmoffscreensurface.cpp
+    qwasmoffscreensurface.cpp \
+    qwasmstring.cpp
 
 HEADERS = \
     qwasmintegration.h \
@@ -39,7 +42,8 @@ HEADERS = \
     qwasmtheme.h \
     qwasmclipboard.h \
     qwasmservices.h \
-    qwasmoffscreensurface.h
+    qwasmoffscreensurface.h \
+    qwasmstring.h
 
 wasmfonts.files = \
     ../../../3rdparty/wasm/Vera.ttf \
@@ -50,6 +54,7 @@ wasmfonts.base = ../../../3rdparty/wasm
 RESOURCES += wasmfonts
 
 qtConfig(opengl) {
+    QT += opengl
     SOURCES += qwasmbackingstore.cpp
     HEADERS += qwasmbackingstore.h
 }
diff --git a/src/plugins/platforms/wasm/wasm_shell.html b/src/plugins/platforms/wasm/wasm_shell.html
index a118c217f3..d4bf632830 100644
--- a/src/plugins/platforms/wasm/wasm_shell.html
+++ b/src/plugins/platforms/wasm/wasm_shell.html
@@ -17,7 +17,7 @@
   <body onload="init()">
     <figure style="overflow:visible;" id="qtspinner">
       <center style="margin-top:1.5em; line-height:150%">
-        <img src="qtlogo.svg"; width=320; height=200; style="display:block"> </img>
+        <img src="qtlogo.svg" width="320" height="200" style="display:block"></img>
         <strong>Qt for WebAssembly: @APPNAME@</strong>
         <div id="qtstatus"></div>
         <noscript>JavaScript is disabled. Please enable JavaScript to use this application.</noscript>