1 files changed, 53 insertions, 23 deletions

diff --git a/src/plugins/platforms/wasm/CMakeLists.txt b/src/plugins/platforms/wasm/CMakeLists.txt
index 10e247b7dd..185b921a4f 100644
--- a/src/plugins/platforms/wasm/CMakeLists.txt
+++ b/src/plugins/platforms/wasm/CMakeLists.txt
@@ -1,4 +1,5 @@
-# Generated from wasm.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## QWasmIntegrationPlugin Plugin:
@@ -6,30 +7,40 @@
 
 qt_internal_add_plugin(QWasmIntegrationPlugin
     OUTPUT_NAME qwasm
-    DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES wasm # special case
-    TYPE platforms
+    DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES wasm
+    PLUGIN_TYPE platforms
     STATIC
     SOURCES
         main.cpp
+        qwasmaccessibility.cpp qwasmaccessibility.h
+        qwasmbase64iconstore.cpp qwasmbase64iconstore.h
         qwasmclipboard.cpp qwasmclipboard.h
         qwasmcompositor.cpp qwasmcompositor.h
+        qwasmcssstyle.cpp qwasmcssstyle.h
         qwasmcursor.cpp qwasmcursor.h
+        qwasmdom.cpp qwasmdom.h
+        qwasmevent.cpp qwasmevent.h
         qwasmeventdispatcher.cpp qwasmeventdispatcher.h
-        qwasmeventtranslator.cpp qwasmeventtranslator.h
         qwasmfontdatabase.cpp qwasmfontdatabase.h
         qwasmintegration.cpp qwasmintegration.h
+        qwasmkeytranslator.cpp qwasmkeytranslator.h
         qwasmoffscreensurface.cpp qwasmoffscreensurface.h
         qwasmopenglcontext.cpp qwasmopenglcontext.h
+        qwasmplatform.cpp qwasmplatform.h
         qwasmscreen.cpp qwasmscreen.h
         qwasmservices.cpp qwasmservices.h
-        qwasmstring.cpp qwasmstring.h
-        qwasmstylepixmaps_p.h
         qwasmtheme.cpp qwasmtheme.h
         qwasmwindow.cpp qwasmwindow.h
+        qwasmwindowclientarea.cpp qwasmwindowclientarea.h
+        qwasmwindowtreenode.cpp qwasmwindowtreenode.h
+        qwasmwindownonclientarea.cpp qwasmwindownonclientarea.h
+        qwasminputcontext.cpp qwasminputcontext.h
+        qwasmwindowstack.cpp qwasmwindowstack.h
+        qwasmdrag.cpp qwasmdrag.h
     DEFINES
         QT_EGL_NO_X11
         QT_NO_FOREACH
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::CorePrivate
         Qt::Gui
@@ -37,42 +48,61 @@ qt_internal_add_plugin(QWasmIntegrationPlugin
 )
 
 # Resources:
-set_source_files_properties("${QT_SOURCE_TREE}/src/3rdparty/wasm/Vera.ttf" PROPERTIES QT_RESOURCE_ALIAS "Vera.ttf")
-set_source_files_properties("${QT_SOURCE_TREE}/src/3rdparty/wasm/DejaVuSans.ttf" PROPERTIES QT_RESOURCE_ALIAS "DejaVuSans.ttf")
-set_source_files_properties("${QT_SOURCE_TREE}/src/3rdparty/wasm/DejaVuSansMono.ttf" PROPERTIES QT_RESOURCE_ALIAS "DejaVuSansMono.ttf")
-
 set(wasmfonts_resource_files
-    "${QT_SOURCE_TREE}/src/3rdparty/wasm/Vera.ttf"
-    "${QT_SOURCE_TREE}/src/3rdparty/wasm/DejaVuSans.ttf"
-    "${QT_SOURCE_TREE}/src/3rdparty/wasm/DejaVuSansMono.ttf"
+    "${QtBase_SOURCE_DIR}/src/3rdparty/wasm/DejaVuSans.ttf"
+    "${QtBase_SOURCE_DIR}/src/3rdparty/wasm/DejaVuSansMono.ttf"
 )
 
 qt_internal_add_resource(QWasmIntegrationPlugin "wasmfonts"
     PREFIX
         "/fonts"
+    BASE
+        "${QtBase_SOURCE_DIR}/src/3rdparty/wasm"
     FILES
         ${wasmfonts_resource_files}
 )
+
 qt_internal_extend_target(QWasmIntegrationPlugin CONDITION QT_FEATURE_opengl
     SOURCES
         qwasmbackingstore.cpp qwasmbackingstore.h
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::OpenGL
         Qt::OpenGLPrivate
 )
 
-#### Keys ignored in scope 4:.:.:wasm.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
 
-qt_copy_or_install(FILES
+set(wasm_support_files
     wasm_shell.html
-    DESTINATION "${CMAKE_INSTALL_PREFIX}/plugins/platforms/"
-)
-qt_copy_or_install(FILES
     qtloader.js
-    DESTINATION "${CMAKE_INSTALL_PREFIX}/plugins/platforms/"
+    resources/qtlogo.svg
+)
+
+set(wasmwindow_resource_files
+    "resources/maximize.svg"
+    "resources/qtlogo.svg"
+    "resources/restore.svg"
+    "resources/x.svg"
+)
+
+qt_internal_add_resource(QWasmIntegrationPlugin "wasmwindow"
+    PREFIX
+        "/wasm-window"
+    BASE
+        "resources"
+    FILES
+        ${wasmwindow_resource_files}
 )
+
+qt_path_join(destination ${QT_INSTALL_DIR} "plugins/platforms")
 qt_copy_or_install(FILES
-    qtlogo.svg
-    DESTINATION "${CMAKE_INSTALL_PREFIX}/plugins/platforms/"
+    ${wasm_support_files}
+    DESTINATION "${destination}"
 )
+# Need to copy the support files to the build dir in a top-level prefix build
+# So _qt_internal_wasm_add_target_helpers finds them.
+if(QT_WILL_INSTALL)
+    foreach(wasm_support_file ${wasm_support_files})
+        file(COPY "${wasm_support_file}" DESTINATION "${QT_BUILD_DIR}/plugins/platforms")
+    endforeach()
+endif()