1 files changed, 56 insertions, 3 deletions

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index cef71318d8..edf6ef09e9 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -7,7 +7,9 @@ qt_find_package(WrapPNG PROVIDED_TARGETS WrapPNG::WrapPNG)
 qt_find_package(WrapFreetype PROVIDED_TARGETS WrapFreetype::WrapFreetype)
 
 if (QT_FEATURE_gui)
-    if(WIN32)
+    if(QT_QPA_PLATFORMS)
+        list(GET QT_QPA_PLATFORMS 0 _default_platform)
+    elseif(WIN32)
         set(_default_platform "windows")
     elseif(ANDROID)
         set(_default_platform "android")
@@ -30,6 +32,11 @@ if (QT_FEATURE_gui)
     endif()
 
     set(QT_QPA_DEFAULT_PLATFORM "${_default_platform}" CACHE STRING "QPA default platform")
+    if(NOT "${QT_QPA_DEFAULT_PLATFORM}" IN_LIST QT_QPA_PLATFORMS)
+        list(APPEND QT_QPA_PLATFORMS "${QT_QPA_DEFAULT_PLATFORM}")
+        set(QT_QPA_PLATFORMS "${QT_QPA_PLATFORMS}" CACHE STRING
+            "QPA platforms deployed by default" FORCE)
+    endif()
 endif()
 
 # Silence warnings in 3rdparty code
@@ -164,6 +171,7 @@ qt_internal_add_module(Gui
         painting/qcolormatrix_p.h
         painting/qcolorspace.cpp painting/qcolorspace.h painting/qcolorspace_p.h
         painting/qcolortransferfunction_p.h
+        painting/qcolortransfergeneric_p.h
         painting/qcolortransfertable_p.h
         painting/qcolortransform.cpp painting/qcolortransform.h painting/qcolortransform_p.h
         painting/qcolortrc_p.h
@@ -282,11 +290,16 @@ qt_internal_add_module(Gui
         painting/qdrawhelper.cpp
     PRECOMPILED_HEADER
         "kernel/qt_gui_pch.h"
-    GENERATE_CPP_EXPORTS
     QPA_HEADER_FILTERS
         "(^|/)qplatform.+\\.h$|(^|/)qwindowsystem.+\\.h$"
     RHI_HEADER_FILTERS
         "(^|/)qrhi\\.h$|(^|/)qrhi_platform\\.h$|(^|/)qshader\\.h$|(^|/)qshaderdescription\\.h$"
+    ATTRIBUTION_FILE_DIR_PATHS
+        rhi
+        opengl
+        painting
+        text
+        ../3rdparty/VulkanMemoryAllocator
 )
 
 # Resources:
@@ -298,6 +311,15 @@ if(QT_FEATURE_pdf)
         "../3rdparty/icc/sRGB2014.icc"
         "painting/qpdfa_metadata.xml"
     )
+    qt_internal_extend_target(Gui
+        ATTRIBUTION_FILE_DIR_PATHS
+            ../3rdparty/icc
+    )
+    qt_internal_sbom_add_license(
+        LICENSE_ID "ICC-License"
+        LICENSE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/icc/LICENSE.txt"
+    )
+
     qt_internal_add_resource(Gui "qpdf"
        PREFIX
            "/qpdf/"
@@ -376,6 +398,11 @@ qt_internal_extend_target(Gui CONDITION MACOS
         ${FWAppKit}
 )
 
+qt_internal_extend_target(Gui CONDITION UIKIT
+    SOURCES
+        platform/ios/qiosnativeinterface.cpp
+)
+
 qt_internal_extend_target(Gui CONDITION WASM
     SOURCES
         platform/wasm/qwasmnativeinterface.cpp
@@ -402,6 +429,19 @@ qt_internal_extend_target(Gui CONDITION APPLE
         ${FWImageIO}
 )
 
+qt_internal_extend_target(Gui CONDITION APPLE AND QT_FEATURE_metal
+    SOURCES
+        platform/darwin/qmetallayer.mm platform/darwin/qmetallayer_p.h
+    LIBRARIES
+        ${FWQuartzCore}
+)
+
+qt_internal_extend_target(Gui CONDITION QNX
+    SOURCES
+        painting/qrasterbackingstore.cpp painting/qrasterbackingstore_p.h
+        painting/qrhibackingstore.cpp painting/qrhibackingstore_p.h
+)
+
 qt_internal_extend_target(Gui CONDITION QT_FEATURE_animation
     SOURCES
         animation/qguivariantanimation.cpp
@@ -438,6 +478,8 @@ qt_internal_extend_target(Gui CONDITION WIN32
         dxgi
         dxguid
         d3d12
+    ATTRIBUTION_FILE_DIR_PATHS
+        ../3rdparty/D3D12MemoryAllocator
 )
 
 if(QT_FEATURE_graphicsframecapture)
@@ -694,6 +736,8 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader AND NOT QT
         MD4C_USE_UTF8
     INCLUDE_DIRECTORIES
         ../3rdparty/md4c
+    ATTRIBUTION_FILE_DIR_PATHS
+        ../3rdparty/md4c
 )
 
 qt_internal_extend_target(Gui CONDITION QT_FEATURE_textmarkdownwriter
@@ -773,7 +817,12 @@ qt_internal_extend_target(Gui CONDITION MINGW AND WIN32
 # Note: These helpers are only used for 16-bit surfaces, so excluding them does not generally
 # exclude neon-drawhelpers on these platforms.
 if(UNIX AND NOT ANDROID AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") AND NOT UIKIT AND NOT QT_IS_MACOS_UNIVERSAL)
-    qt_internal_extend_target(Gui DEFINES ENABLE_PIXMAN_DRAWHELPERS)
+    qt_internal_extend_target(Gui
+        DEFINES
+            ENABLE_PIXMAN_DRAWHELPERS
+        ATTRIBUTION_FILE_DIR_PATHS
+            ../3rdparty/pixman
+    )
     qt_internal_add_simd_part(Gui SIMD neon
         SOURCES
             ../3rdparty/pixman/pixman-arm-neon-asm.S
@@ -798,6 +847,8 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_system_zlib
 qt_internal_extend_target(Gui CONDITION NOT QT_FEATURE_system_zlib
     INCLUDE_DIRECTORIES
         ../3rdparty/zlib/src
+    ATTRIBUTION_FILE_DIR_PATHS
+        ../3rdparty/zlib
 )
 
 qt_internal_extend_target(Gui CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep
@@ -863,6 +914,8 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_vulkan
         vulkan/qvulkanfunctions.cpp
         vulkan/qvulkaninstance.cpp vulkan/qvulkaninstance.h vulkan/qvulkaninstance_p.h
         vulkan/qvulkanwindow.cpp vulkan/qvulkanwindow.h vulkan/qvulkanwindow_p.h
+    ATTRIBUTION_FILE_DIR_PATHS
+        vulkan
 )
 if(QT_FEATURE_vulkan)
     qt_internal_add_target_include_dirs_and_optionally_propagate(