1 files changed, 15 insertions, 15 deletions
diff --git a/tests/manual/wasm/qstdweb/qwasmcompositor_main.cpp b/tests/manual/wasm/qstdweb/qwasmcompositor_main.cpp
index 17ab7a90e8..e1a9cf604d 100644
--- a/tests/manual/wasm/qstdweb/qwasmcompositor_main.cpp
+++ b/tests/manual/wasm/qstdweb/qwasmcompositor_main.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QtCore/QEvent>
 #include <QtCore/QObject>
@@ -7,7 +7,7 @@
 #include <QtGui/qguiapplication.h>
 #include <QtGui/qoffscreensurface.h>
 #include <QtGui/qpa/qwindowsysteminterface.h>
-#include <QtGui/private/qrhigles2_p.h>
+#include <QtGui/rhi/qrhi.h>
 
 #include <qtwasmtestlib.h>
 
@@ -66,7 +66,7 @@ void Window::keyPressEvent(QKeyEvent *)
 
 void Window::init()
 {
-    QRhi::Flags rhiFlags = QRhi::EnableDebugMarkers | QRhi::EnableProfiling;
+    QRhi::Flags rhiFlags = QRhi::EnableDebugMarkers;
 
     m_fallbackSurface.reset(QRhiGles2InitParams::newFallbackSurface());
     QRhiGles2InitParams params;
@@ -94,10 +94,8 @@ public:
     QWasmCompositorTest() : m_window(val::global("window")), m_testSupport(val::object())
     {
         m_window.set("testSupport", m_testSupport);
-        m_testSupport.set("qtAddContainerElement",
-                          emscripten::val::module_property("qtAddContainerElement"));
-        m_testSupport.set("qtRemoveContainerElement",
-                          emscripten::val::module_property("qtRemoveContainerElement"));
+        m_testSupport.set("qtSetContainerElements",
+                          emscripten::val::module_property("qtSetContainerElements"));
     }
 
     ~QWasmCompositorTest() noexcept
@@ -112,19 +110,18 @@ private:
     void init()
     {
         EM_ASM({
-            const canvas = document.createElement("canvas");
-            canvas.id = "test-canvas-qwasmcompositor";
-            testSupport.canvas = canvas;
-            document.body.appendChild(canvas);
+            testSupport.screenElement = document.createElement("div");
+            testSupport.screenElement.id = "test-canvas-qwasmcompositor";
+            document.body.appendChild(testSupport.screenElement);
         });
         m_cleanup.emplace_back([]() mutable {
             EM_ASM({
-                testSupport.qtRemoveContainerElement(testSupport.canvas);
-                testSupport.canvas.parentElement.removeChild(testSupport.canvas);
+                testSupport.qtSetContainerElements([]);
+                testSupport.screenElement.parentElement.removeChild(testSupport.screenElement);
             });
         });
 
-        EM_ASM({ testSupport.qtAddContainerElement(testSupport.canvas); });
+        EM_ASM({ testSupport.qtSetContainerElements([testSupport.screenElement]); });
     }
 
     template<class T>
@@ -158,7 +155,10 @@ void QWasmCompositorTest::testReceivingKeyboardEventsAfterOpenGLContextReset()
     QObject::connect(window, &Window::initFailed,
                      []() { QWASMFAIL("Cannot initialize test window"); });
     QObject::connect(window, &Window::exposed, []() {
-        EM_ASM({ testSupport.canvas.dispatchEvent(new KeyboardEvent('keydown', { key : 'a' })); });
+        EM_ASM({
+            testSupport.screenElement.shadowRoot.querySelector('.qt-window')
+                    .dispatchEvent(new KeyboardEvent('keydown', { key : 'a' }));
+        });
     });
 }