Re-generate the CMakeLists.txt and add the prev files

Change-Id: I93ea196bdd5807bccebf81e72332966288a35a4f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-06-05 13:48:02 +02:00 · 2019-06-05 13:48:02 +02:00 · bc9409d857
commit bc9409d857
parent 9298033ed6
24 changed files with 908 additions and 93 deletions
--- a/src/platformsupport/eglconvenience/.prev_CMakeLists.txt
+++ b/src/platformsupport/eglconvenience/.prev_CMakeLists.txt
@ -0,0 +1,53 @@
+# Generated from eglconvenience.pro.
+
+#####################################################################
+## EglSupport Module:
+#####################################################################
+
+add_qt_module(EglSupport
+    STATIC
+    SOURCES
+        qeglconvenience.cpp qeglconvenience_p.h
+        qeglstreamconvenience.cpp qeglstreamconvenience_p.h
+        qt_egl_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:eglconvenience.pro:<TRUE>:
+# CONFIG = "static" "internal_module" "egl"
+# MODULE = "egl_support"
+# PRECOMPILED_HEADER = "../../corelib/global/qt_pch.h"
+# _LOADED = "qt_module"
+
+## Scopes:
+#####################################################################
+
+extend_target(EglSupport CONDITION QT_FEATURE_opengl
+    SOURCES
+        qeglpbuffer.cpp qeglpbuffer_p.h
+        qeglplatformcontext.cpp qeglplatformcontext_p.h
+)
+
+extend_target(EglSupport CONDITION QT_FEATURE_egl_x11
+    SOURCES
+        qxlibeglintegration.cpp qxlibeglintegration_p.h
+    LIBRARIES
+        X11::XCB
+)
+
+extend_target(EglSupport CONDITION NOT QT_FEATURE_egl_x11
+    DEFINES
+        QT_EGL_NO_X11
+)
+
+extend_target(EglSupport CONDITION QT_FEATURE_dlopen
+    PUBLIC_LIBRARIES
+        ${CMAKE_DL_LIBS}
+)
--- a/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt
+++ b/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt
@ -0,0 +1,45 @@
+# Generated from eventdispatchers.pro.
+
+#####################################################################
+## EventDispatcherSupport Module:
+#####################################################################
+
+add_qt_module(EventDispatcherSupport
+    STATIC
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:eventdispatchers.pro:<TRUE>:
+# CONFIG = "static" "internal_module"
+# MODULE = "eventdispatcher_support"
+# PRECOMPILED_HEADER = "../../corelib/global/qt_pch.h"
+# _LOADED = "qt_module"
+
+## Scopes:
+#####################################################################
+
+extend_target(EventDispatcherSupport CONDITION UNIX
+    SOURCES
+        qgenericunixeventdispatcher.cpp qgenericunixeventdispatcher_p.h
+        qunixeventdispatcher.cpp
+        qunixeventdispatcher_qpa_p.h
+)
+
+extend_target(EventDispatcherSupport CONDITION WIN32
+    SOURCES
+        qwindowsguieventdispatcher.cpp qwindowsguieventdispatcher_p.h
+)
+
+extend_target(EventDispatcherSupport CONDITION QT_FEATURE_glib
+    SOURCES
+        qeventdispatcher_glib.cpp qeventdispatcher_glib_p.h
+    LIBRARIES
+        GLIB2::GLIB2
+)
--- a/src/platformsupport/input/.prev_CMakeLists.txt
+++ b/src/platformsupport/input/.prev_CMakeLists.txt
@ -0,0 +1,142 @@
+# Generated from input.pro.
+
+#####################################################################
+## InputSupport Module:
+#####################################################################
+
+add_qt_module(InputSupport
+    STATIC
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::DeviceDiscoverySupportPrivate
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::DeviceDiscoverySupport
+        Qt::Gui
+)
+
+#### Keys ignored in scope 3:.:.:input-support.pro:<TRUE>:
+# CONFIG = "static" "internal_module"
+# MODULE = "input_support"
+# PRECOMPILED_HEADER = "../../corelib/global/qt_pch.h"
+# _LOADED = "qt_module"
+
+## Scopes:
+#####################################################################
+
+extend_target(InputSupport CONDITION QT_FEATURE_evdev
+    SOURCES
+        evdevkeyboard/qevdevkeyboard_defaultmap_p.h
+        evdevkeyboard/qevdevkeyboardhandler.cpp evdevkeyboard/qevdevkeyboardhandler_p.h
+        evdevkeyboard/qevdevkeyboardmanager.cpp evdevkeyboard/qevdevkeyboardmanager_p.h
+        evdevmouse/qevdevmousehandler.cpp evdevmouse/qevdevmousehandler_p.h
+        evdevmouse/qevdevmousemanager.cpp evdevmouse/qevdevmousemanager_p.h
+        evdevtouch/qevdevtouchhandler.cpp evdevtouch/qevdevtouchhandler_p.h
+        evdevtouch/qevdevtouchmanager.cpp evdevtouch/qevdevtouchmanager_p.h
+    INCLUDE_DIRECTORIES
+        evdevtouch/../shared
+)
+
+extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_tabletevent
+    SOURCES
+        evdevtablet/qevdevtablethandler.cpp evdevtablet/qevdevtablethandler_p.h
+        evdevtablet/qevdevtabletmanager.cpp evdevtablet/qevdevtabletmanager_p.h
+)
+
+extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev AND QT_FEATURE_tabletevent
+    LIBRARIES
+        PkgConfig::Libudev
+)
+
+extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev
+    LIBRARIES
+        PkgConfig::Libudev
+)
+
+extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_mtdev
+    LIBRARIES
+        PkgConfig::Mtdev
+)
+
+extend_target(InputSupport CONDITION QT_FEATURE_tslib
+    SOURCES
+        tslib/qtslib.cpp tslib/qtslib_p.h
+    PUBLIC_LIBRARIES
+        PkgConfig::Tslib
+)
+
+extend_target(InputSupport CONDITION QT_FEATURE_libinput
+    SOURCES
+        libinput/qlibinputhandler.cpp libinput/qlibinputhandler_p.h
+        libinput/qlibinputkeyboard.cpp libinput/qlibinputkeyboard_p.h
+        libinput/qlibinputpointer.cpp libinput/qlibinputpointer_p.h
+        libinput/qlibinputtouch.cpp libinput/qlibinputtouch_p.h
+    INCLUDE_DIRECTORIES
+        libinput/../shared
+    LIBRARIES
+        Libinput::Libinput
+        PkgConfig::Libudev
+)
+
+extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon
+    LIBRARIES
+        Qt::XkbCommonSupportPrivate
+        XKB::XKB
+    PUBLIC_LIBRARIES
+        Qt::XkbCommonSupport
+)
+
+extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput
+    SOURCES
+        shared/qtouchoutputmapping.cpp shared/qtouchoutputmapping_p.h
+)
+
+extend_target(InputSupport CONDITION QT_FEATURE_integrityhid
+    SOURCES
+        integrityhid/qintegrityhidmanager.cpp integrityhid/qintegrityhidmanager.h
+    LIBRARIES
+        integrityhid
+)
+
+if(QT_FEATURE_xkbcommon)
+    add_subdirectory(xkbcommon)
+endif()
+
+    if(QT_FEATURE_evdev)
+
+        if(QT_FEATURE_tabletevent)
+
+            if(QT_FEATURE_libudev)
+            endif()
+        endif()
+
+        if(QT_FEATURE_libudev)
+        endif()
+
+        if(QT_FEATURE_libudev)
+        endif()
+
+        if(QT_FEATURE_libudev)
+        endif()
+
+        if(QT_FEATURE_mtdev)
+        endif()
+    endif()
+
+    if(QT_FEATURE_tslib)
+    endif()
+
+    if(QT_FEATURE_libinput)
+
+        if(QT_FEATURE_xkbcommon)
+        endif()
+    endif()
+
+    if(QT_FEATURE_evdev OR QT_FEATURE_libinput)
+    endif()
+
+    if(QT_FEATURE_integrityhid)
+    endif()
--- a/src/platformsupport/input/xkbcommon/CMakeLists.txt
+++ b/src/platformsupport/input/xkbcommon/CMakeLists.txt
@ -31,5 +31,5 @@ add_qt_module(XkbCommonSupport

 extend_target(XkbCommonSupport CONDITION CLANG AND NOT ICC
    COMPILE_OPTIONS
-        "-ftemplate-depth=1024"
+        -ftemplate-depth=1024
 )
--- a/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt
+++ b/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt
@ -0,0 +1,25 @@
+# Generated from kmsconvenience.pro.
+
+#####################################################################
+## KmsSupport Module:
+#####################################################################
+
+add_qt_module(KmsSupport
+    STATIC
+    SOURCES
+        qkmsdevice.cpp qkmsdevice_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Libdrm::Libdrm
+        Qt::Core
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:kmsconvenience.pro:<TRUE>:
+# CONFIG = "static" "internal_module"
+# MODULE = "kms_support"
+# _LOADED = "qt_module"
--- a/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt
+++ b/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt
@ -0,0 +1,45 @@
+# Generated from linuxaccessibility.pro.
+
+#####################################################################
+## LinuxAccessibilitySupport Module:
+#####################################################################
+
+add_qt_module(LinuxAccessibilitySupport
+    STATIC
+    SOURCES
+        application.cpp application_p.h
+        atspiadaptor.cpp atspiadaptor_p.h
+        bridge.cpp bridge_p.h
+        cache.cpp cache_p.h
+        constant_mappings.cpp constant_mappings_p.h
+        dbusconnection.cpp dbusconnection_p.h
+        struct_marshallers.cpp struct_marshallers_p.h
+    DBUS_ADAPTOR_SOURCES
+        dbusxml/Cache.xml
+        dbusxml/DeviceEventController.xml
+    DBUS_ADAPTOR_FLAGS
+        "-i" "struct_marshallers_p.h"
+    DBUS_INTERFACE_SOURCES
+        dbusxml/Bus.xml
+        dbusxml/Socket.xml
+    DBUS_INTERFACE_FLAGS
+        "-i" "struct_marshallers_p.h"
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    LIBRARIES
+        Qt::AccessibilitySupportPrivate
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        PkgConfig::ATSPI2_nolink
+        Qt::AccessibilitySupport
+        Qt::Core
+        Qt::DBus
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:linuxaccessibility.pro:<TRUE>:
+# CONFIG = "static" "internal_module"
+# MODULE = "linuxaccessibility_support"
+# PRECOMPILED_HEADER = "../../corelib/global/qt_pch.h"
+# _LOADED = "qt_module"
--- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
@ -0,0 +1,144 @@
+# Generated from eglfs.pro.
+
+#####################################################################
+## EglFSDeviceIntegration Module:
+#####################################################################
+
+add_qt_module(EglFSDeviceIntegration
+    SOURCES
+        api/qeglfsdeviceintegration.cpp api/qeglfsdeviceintegration_p.h
+        api/qeglfsglobal_p.h
+        api/qeglfshooks.cpp api/qeglfshooks_p.h
+        api/qeglfsintegration.cpp api/qeglfsintegration_p.h
+        api/qeglfsoffscreenwindow.cpp api/qeglfsoffscreenwindow_p.h
+        api/qeglfsscreen.cpp api/qeglfsscreen_p.h
+        api/qeglfswindow.cpp api/qeglfswindow_p.h
+    DEFINES
+        QT_BUILD_EGL_DEVICE_LIB
+        QT_EGL_NO_X11
+    INCLUDE_DIRECTORIES
+        api
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::DeviceDiscoverySupportPrivate
+        Qt::EglSupportPrivate
+        Qt::EventDispatcherSupportPrivate
+        Qt::FbSupportPrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::GuiPrivate
+        Qt::ServiceSupportPrivate
+        Qt::ThemeSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::DeviceDiscoverySupport
+        Qt::EglSupport
+        Qt::EventDispatcherSupport
+        Qt::FbSupport
+        Qt::FontDatabaseSupport
+        Qt::Gui
+        Qt::ServiceSupport
+        Qt::ThemeSupport
+)
+
+#### Keys ignored in scope 2:.:.:eglfsdeviceintegration.pro:<TRUE>:
+# CONFIG = "internal_module" "egl"
+# MODULE = "eglfsdeviceintegration"
+# _LOADED = "qt_module"
+
+## Scopes:
+#####################################################################
+
+extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate
+    LIBRARIES
+        Qt::InputSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::InputSupport
+)
+
+extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupportPrivate
+    LIBRARIES
+        Qt::PlatformCompositorSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::PlatformCompositorSupport
+)
+
+extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY
+    DEFINES
+        EGLFS_PLATFORM_HOOKS
+)
+
+extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY
+    DEFINES
+        EGLFS_PREFERRED_PLUGIN=
+)
+
+#### Keys ignored in scope 7:.:.:eglfsdeviceintegration.pro:use_gold_linker:
+# CONFIG = "no_linker_version_script"
+
+# Resources:
+add_qt_resource(EglFSDeviceIntegration "cursor" FILES
+    cursor-atlas.png
+    cursor.json)
+
+
+extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
+    SOURCES
+        api/qeglfscontext.cpp api/qeglfscontext_p.h
+        api/qeglfscursor.cpp api/qeglfscursor_p.h
+)
+#####################################################################
+## qeglfs Plugin:
+#####################################################################
+
+add_qt_plugin(qeglfs
+    TYPE platforms
+    CLASS_NAME QEglFSIntegrationPlugin
+    SOURCES
+        qeglfsmain.cpp
+    DEFINES
+        QT_EGL_NO_X11
+    INCLUDE_DIRECTORIES
+        api
+    LIBRARIES
+        Qt::EglFSDeviceIntegrationPrivate
+    PUBLIC_LIBRARIES
+        Qt::EglFSDeviceIntegration
+)
+
+#### Keys ignored in scope 11:.:.:eglfs-plugin.pro:<TRUE>:
+# CONFIG = "egl"
+# OTHER_FILES = "$$PWD/eglfs.json"
+# PLUGIN_CLASS_NAME = "QEglFSIntegrationPlugin"
+# PLUGIN_TYPE = "platforms"
+# _LOADED = "qt_plugin"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 12:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
+add_subdirectory(deviceintegration)
+
+    if(TARGET Qt::InputSupportPrivate)
+    endif()
+
+    if(TARGET Qt::PlatformCompositorSupportPrivate)
+    endif()
+
+    if(NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY)
+    endif()
+
+    if(NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY)
+    endif()
+
+    if(use_gold_linker)
+    endif()
+
+    if(NOT DEFINES___contains___QT_NO_CURSOR)
+    endif()
+
+    if(QT_FEATURE_opengl)
+    endif()
+
+    if(NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN)
+    endif()
--- a/src/plugins/platforms/eglfs/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/CMakeLists.txt
@ -1,3 +1,4 @@
+# Generated from eglfs.pro.
 qt_find_package(EGL) # special case

 #####################################################################
@ -14,8 +15,8 @@ add_qt_module(EglFSDeviceIntegration
        api/qeglfsscreen.cpp api/qeglfsscreen_p.h
        api/qeglfswindow.cpp api/qeglfswindow_p.h
    DEFINES
-        QT_EGL_NO_X11
        QT_BUILD_EGL_DEVICE_LIB
+        QT_EGL_NO_X11
    INCLUDE_DIRECTORIES
        api
    LIBRARIES
@ -31,7 +32,7 @@ add_qt_module(EglFSDeviceIntegration
        EGL::EGL # special case
 )

-#### Keys ignored in scope 2:.:./eglfsdeviceintegration.pro:<NONE>:
+#### Keys ignored in scope 2:.:.:eglfsdeviceintegration.pro:<TRUE>:
 # CONFIG = "internal_module" "egl"
 # MODULE = "eglfsdeviceintegration"
 # _LOADED = "qt_module"
@ -42,18 +43,22 @@ add_qt_module(EglFSDeviceIntegration
 extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate
    LIBRARIES
        Qt::InputSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::InputSupport
 )

 extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupportPrivate
    LIBRARIES
        Qt::PlatformCompositorSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::PlatformCompositorSupport
 )

 # special case:
 # extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY ...
 # extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY ...

-#### Keys ignored in scope 7:.:./eglfsdeviceintegration.pro:use_gold_linker:
+#### Keys ignored in scope 7:.:.:eglfsdeviceintegration.pro:use_gold_linker:
 # CONFIG = "no_linker_version_script"

 # Resources:
@ -73,6 +78,7 @@ extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl

 add_qt_plugin(qeglfs
    TYPE platforms
+    CLASS_NAME QEglFSIntegrationPlugin
    SOURCES
        qeglfsmain.cpp
    DEFINES
@ -85,16 +91,17 @@ add_qt_plugin(qeglfs
        EGL::EGL # special case
 )

-#### Keys ignored in scope 11:.:./eglfs-plugin.pro:<NONE>:
+#### Keys ignored in scope 11:.:.:eglfs-plugin.pro:<TRUE>:
 # CONFIG = "egl"
 # OTHER_FILES = "$$PWD/eglfs.json"
 # PLUGIN_CLASS_NAME = "QEglFSIntegrationPlugin"
+# PLUGIN_TYPE = "platforms"
 # _LOADED = "qt_plugin"

 ## Scopes:
 #####################################################################

-#### Keys ignored in scope 12:.:./eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 12:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
 add_subdirectory(deviceintegration)

--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt
@ -6,6 +6,7 @@

 add_qt_plugin(qeglfs-emu-integration
    TYPE egldeviceintegrations
+    CLASS_NAME QEglFSEmulatorIntegrationPlugin
    SOURCES
        qeglfsemulatorintegration.cpp qeglfsemulatorintegration.h
        qeglfsemulatorscreen.cpp qeglfsemulatorscreen.h
@ -16,11 +17,18 @@ add_qt_plugin(qeglfs-emu-integration
        ../../api
    LIBRARIES
        Qt::CorePrivate
-        Qt::GuiPrivate
        Qt::EglFSDeviceIntegrationPrivate
-    # CONFIG = "egl"
-    # DISTFILES = "eglfs_emu.json"
-    # OTHER_FILES = "$$PWD/eglfs_emu.json"
-    # PLUGIN_CLASS_NAME = "QEglFSEmulatorIntegrationPlugin"
-    # _LOADED = "qt_plugin"
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::EglFSDeviceIntegration
+        Qt::Gui
 )
+
+#### Keys ignored in scope 1:.:.:eglfs_emu.pro:<TRUE>:
+# CONFIG = "egl"
+# DISTFILES = "eglfs_emu.json"
+# OTHER_FILES = "$$PWD/eglfs_emu.json"
+# PLUGIN_CLASS_NAME = "QEglFSEmulatorIntegrationPlugin"
+# PLUGIN_TYPE = "egldeviceintegrations"
+# _LOADED = "qt_plugin"
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
@ -1,14 +1,12 @@
 # Generated from eglfs_kms.pro.

-qt_find_package(gbm)
-qt_find_package(Libdrm)
-
 #####################################################################
 ## qeglfs-kms-integration Plugin:
 #####################################################################

 add_qt_plugin(qeglfs-kms-integration
    TYPE egldeviceintegrations
+    CLASS_NAME QEglFSKmsGbmIntegrationPlugin
    SOURCES
        qeglfskmsgbmcursor.cpp qeglfskmsgbmcursor.h
        qeglfskmsgbmdevice.cpp qeglfskmsgbmdevice.h
@ -23,16 +21,25 @@ add_qt_plugin(qeglfs-kms-integration
        ../eglfs_kms_support
    LIBRARIES
        Qt::CorePrivate
-        Qt::GuiPrivate
+        Qt::EdidSupportPrivate
        Qt::EglFSDeviceIntegrationPrivate
        Qt::EglFsKmsSupportPrivate
+        Qt::GuiPrivate
        Qt::KmsSupportPrivate
-        Qt::EdidSupportPrivate
-        Qt::PlatformCompositorSupportPrivate
-        gbm::gbm
+    PUBLIC_LIBRARIES
        Libdrm::Libdrm
-    # CONFIG = "egl"
-    # OTHER_FILES = "$$PWD/eglfs_kms.json"
-    # PLUGIN_CLASS_NAME = "QEglFSKmsGbmIntegrationPlugin"
-    # _LOADED = "qt_plugin"
+        Qt::Core
+        Qt::EdidSupport
+        Qt::EglFSDeviceIntegration
+        Qt::EglFsKmsSupport
+        Qt::Gui
+        Qt::KmsSupport
+        gbm::gbm
 )
+
+#### Keys ignored in scope 1:.:.:eglfs_kms.pro:<TRUE>:
+# CONFIG = "egl"
+# OTHER_FILES = "$$PWD/eglfs_kms.json"
+# PLUGIN_CLASS_NAME = "QEglFSKmsGbmIntegrationPlugin"
+# PLUGIN_TYPE = "egldeviceintegrations"
+# _LOADED = "qt_plugin"
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
@ -1,13 +1,12 @@
 # Generated from eglfs_kms_egldevice.pro.

-qt_find_package(Libdrm)
-
 #####################################################################
 ## qeglfs-kms-egldevice-integration Plugin:
 #####################################################################

 add_qt_plugin(qeglfs-kms-egldevice-integration
    TYPE egldeviceintegrations
+    CLASS_NAME QEglFSKmsEglDeviceIntegrationPlugin
    SOURCES
        qeglfskmsegldevice.cpp qeglfskmsegldevice.h
        qeglfskmsegldeviceintegration.cpp qeglfskmsegldeviceintegration.h
@ -20,15 +19,24 @@ add_qt_plugin(qeglfs-kms-egldevice-integration
        ../eglfs_kms_support
    LIBRARIES
        Qt::CorePrivate
-        Qt::GuiPrivate
+        Qt::EdidSupportPrivate
        Qt::EglFSDeviceIntegrationPrivate
        Qt::EglFsKmsSupportPrivate
+        Qt::GuiPrivate
        Qt::KmsSupportPrivate
-        Qt::EdidSupportPrivate
-        Qt::PlatformCompositorSupportPrivate
+    PUBLIC_LIBRARIES
        Libdrm::Libdrm
-    # CONFIG = "egl"
-    # OTHER_FILES = "$$PWD/eglfs_kms_egldevice.json"
-    # PLUGIN_CLASS_NAME = "QEglFSKmsEglDeviceIntegrationPlugin"
-    # _LOADED = "qt_plugin"
+        Qt::Core
+        Qt::EdidSupport
+        Qt::EglFSDeviceIntegration
+        Qt::EglFsKmsSupport
+        Qt::Gui
+        Qt::KmsSupport
 )
+
+#### Keys ignored in scope 1:.:.:eglfs_kms_egldevice.pro:<TRUE>:
+# CONFIG = "egl"
+# OTHER_FILES = "$$PWD/eglfs_kms_egldevice.json"
+# PLUGIN_CLASS_NAME = "QEglFSKmsEglDeviceIntegrationPlugin"
+# PLUGIN_TYPE = "egldeviceintegrations"
+# _LOADED = "qt_plugin"
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt
@ -1,7 +1,5 @@
 # Generated from eglfs_kms_support.pro.

-qt_find_package(Libdrm)
-
 #####################################################################
 ## EglFsKmsSupport Module:
 #####################################################################
@ -19,11 +17,19 @@ add_qt_module(EglFsKmsSupport
        ../../api
    LIBRARIES
        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::EglFSDeviceIntegrationPrivate
-        Qt::KmsSupportPrivate
        Qt::EdidSupportPrivate
+        Qt::EglFSDeviceIntegrationPrivate
+        Qt::GuiPrivate
+        Qt::KmsSupportPrivate
+    PUBLIC_LIBRARIES
        Libdrm::Libdrm
-    # CONFIG = "no_module_headers" "internal_module" "egl"
-    # _LOADED = "qt_module"
+        Qt::Core
+        Qt::EdidSupport
+        Qt::EglFSDeviceIntegration
+        Qt::Gui
+        Qt::KmsSupport
 )
+
+#### Keys ignored in scope 1:.:.:eglfs_kms_support.pro:<TRUE>:
+# CONFIG = "no_module_headers" "internal_module" "egl"
+# _LOADED = "qt_module"
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt
@ -1,15 +1,12 @@
 # Generated from eglfs_x11.pro.

-qt_find_package(XCB)
-qt_find_package(X11)
-qt_find_package(X11_XCB)
-
 #####################################################################
 ## qeglfs-x11-integration Plugin:
 #####################################################################

 add_qt_plugin(qeglfs-x11-integration
    TYPE egldeviceintegrations
+    CLASS_NAME QEglFSX11IntegrationPlugin
    SOURCES
        qeglfsx11integration.cpp qeglfsx11integration.h
        qeglfsx11main.cpp
@ -19,13 +16,19 @@ add_qt_plugin(qeglfs-x11-integration
        ../../api
    LIBRARIES
        Qt::CorePrivate
-        Qt::GuiPrivate
        Qt::EglFSDeviceIntegrationPrivate
-        XCB::XCB
-        X11::X11
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::EglFSDeviceIntegration
+        Qt::Gui
        X11::XCB
-    # CONFIG = "egl"
-    # OTHER_FILES = "$$PWD/eglfs_x11.json"
-    # PLUGIN_CLASS_NAME = "QEglFSX11IntegrationPlugin"
-    # _LOADED = "qt_plugin"
+        XCB::XCB
 )
+
+#### Keys ignored in scope 1:.:.:eglfs_x11.pro:<TRUE>:
+# CONFIG = "egl"
+# OTHER_FILES = "$$PWD/eglfs_x11.json"
+# PLUGIN_CLASS_NAME = "QEglFSX11IntegrationPlugin"
+# PLUGIN_TYPE = "egldeviceintegrations"
+# _LOADED = "qt_plugin"
--- a/src/plugins/platforms/linuxfb/CMakeLists.txt
+++ b/src/plugins/platforms/linuxfb/CMakeLists.txt
@ -6,6 +6,7 @@

 add_qt_plugin(qlinuxfb
    TYPE platforms
+    CLASS_NAME QLinuxFbIntegrationPlugin
    SOURCES
        main.cpp
        qlinuxfbintegration.cpp qlinuxfbintegration.h
@ -14,22 +15,34 @@ add_qt_plugin(qlinuxfb
        QT_NO_FOREACH
    LIBRARIES
        Qt::CorePrivate
+        Qt::EventDispatcherSupportPrivate
+        Qt::FbSupportPrivate
+        Qt::FontDatabaseSupportPrivate
        Qt::GuiPrivate
        Qt::ServiceSupportPrivate
-        Qt::EventDispatcherSupportPrivate
-        Qt::FontDatabaseSupportPrivate
-        Qt::FbSupportPrivate
-    # OTHER_FILES = "linuxfb.json"
-    # PLUGIN_CLASS_NAME = "QLinuxFbIntegrationPlugin"
-    # _LOADED = "qt_plugin"
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::EventDispatcherSupport
+        Qt::FbSupport
+        Qt::FontDatabaseSupport
+        Qt::Gui
+        Qt::ServiceSupport
 )

+#### Keys ignored in scope 1:.:.:linuxfb.pro:<TRUE>:
+# OTHER_FILES = "linuxfb.json"
+# PLUGIN_CLASS_NAME = "QLinuxFbIntegrationPlugin"
+# PLUGIN_TYPE = "platforms"
+# _LOADED = "qt_plugin"
+
 ## Scopes:
 #####################################################################

 extend_target(qlinuxfb CONDITION TARGET Qt::InputSupportPrivate
    LIBRARIES
        Qt::InputSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::InputSupport
 )

 extend_target(qlinuxfb CONDITION TARGET Qt::KmsSupportPrivate
@ -37,8 +50,9 @@ extend_target(qlinuxfb CONDITION TARGET Qt::KmsSupportPrivate
        qlinuxfbdrmscreen.cpp qlinuxfbdrmscreen.h
    LIBRARIES
        Qt::KmsSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::KmsSupport
 )
-#
-#extend_target(qlinuxfb CONDITION NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN
-#    # PLUGIN_EXTENDS = "-"
-#)
+
+#### Keys ignored in scope 4:.:.:linuxfb.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
--- a/src/plugins/platforms/minimal/CMakeLists.txt
+++ b/src/plugins/platforms/minimal/CMakeLists.txt
@ -1,4 +1,4 @@
-qt_find_package(WrapFreetype) # special case
+# Generated from minimal.pro.

 #####################################################################
 ## qminimal Plugin:
@ -6,6 +6,7 @@ qt_find_package(WrapFreetype) # special case

 add_qt_plugin(qminimal
    TYPE platforms
+    CLASS_NAME QMinimalIntegrationPlugin
    SOURCES
        main.cpp
        qminimalbackingstore.cpp qminimalbackingstore.h
@ -17,11 +18,17 @@ add_qt_plugin(qminimal
        Qt::EventDispatcherSupportPrivate
        Qt::FontDatabaseSupportPrivate
        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::EventDispatcherSupport
+        Qt::FontDatabaseSupport
+        Qt::Gui
 )

-#### Keys ignored in scope 1:.:minimal.pro:<NONE>:
+#### Keys ignored in scope 1:.:.:minimal.pro:<TRUE>:
 # OTHER_FILES = "minimal.json"
 # PLUGIN_CLASS_NAME = "QMinimalIntegrationPlugin"
+# PLUGIN_TYPE = "platforms"
 # _LOADED = "qt_plugin"

 ## Scopes:
@ -32,5 +39,5 @@ extend_target(qminimal CONDITION QT_FEATURE_freetype
        WrapFreetype::WrapFreetype
 )

-#### Keys ignored in scope 3:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 3:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
--- a/src/plugins/platforms/minimalegl/CMakeLists.txt
+++ b/src/plugins/platforms/minimalegl/CMakeLists.txt
@ -6,6 +6,7 @@

 add_qt_plugin(qminimalegl
    TYPE platforms
+    CLASS_NAME QMinimalEglIntegrationPlugin
    SOURCES
        main.cpp
        qminimaleglintegration.cpp qminimaleglintegration.h
@ -15,16 +16,25 @@ add_qt_plugin(qminimalegl
        QT_EGL_NO_X11
    LIBRARIES
        Qt::CorePrivate
-        Qt::GuiPrivate
+        Qt::EglSupportPrivate
        Qt::EventDispatcherSupportPrivate
        Qt::FontDatabaseSupportPrivate
-        Qt::EglSupportPrivate
-    # CONFIG = "egl"
-    # OTHER_FILES = "minimalegl.json"
-    # PLUGIN_CLASS_NAME = "QMinimalEglIntegrationPlugin"
-    # _LOADED = "qt_plugin"
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::EglSupport
+        Qt::EventDispatcherSupport
+        Qt::FontDatabaseSupport
+        Qt::Gui
 )

+#### Keys ignored in scope 1:.:.:minimalegl.pro:<TRUE>:
+# CONFIG = "egl"
+# OTHER_FILES = "minimalegl.json"
+# PLUGIN_CLASS_NAME = "QMinimalEglIntegrationPlugin"
+# PLUGIN_TYPE = "platforms"
+# _LOADED = "qt_plugin"
+
 ## Scopes:
 #####################################################################

@ -32,7 +42,6 @@ extend_target(qminimalegl CONDITION QT_FEATURE_opengl
    SOURCES
        qminimaleglbackingstore.cpp qminimaleglbackingstore.h
 )
-#
-#extend_target(qminimalegl CONDITION NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN
-#    # PLUGIN_EXTENDS = "-"
-#)
+
+#### Keys ignored in scope 3:.:.:minimalegl.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
--- a/src/plugins/platforms/offscreen/CMakeLists.txt
+++ b/src/plugins/platforms/offscreen/CMakeLists.txt
@ -6,6 +6,7 @@

 add_qt_plugin(qoffscreen
    TYPE platforms
+    CLASS_NAME QOffscreenIntegrationPlugin
    SOURCES
        main.cpp
        qoffscreencommon.cpp qoffscreencommon.h
@ -25,9 +26,10 @@ add_qt_plugin(qoffscreen
        Qt::Gui
 )

-#### Keys ignored in scope 1:.:.:./offscreen.pro:<TRUE>:
+#### Keys ignored in scope 1:.:.:offscreen.pro:<TRUE>:
 # OTHER_FILES = "offscreen.json"
 # PLUGIN_CLASS_NAME = "QOffscreenIntegrationPlugin"
+# PLUGIN_TYPE = "platforms"
 # _LOADED = "qt_plugin"

 ## Scopes:
--- a/src/plugins/platforms/vnc/CMakeLists.txt
+++ b/src/plugins/platforms/vnc/CMakeLists.txt
@ -6,6 +6,7 @@

 add_qt_plugin(qvnc
    TYPE platforms
+    CLASS_NAME QVncIntegrationPlugin
    SOURCES
        main.cpp
        qvnc.cpp qvnc_p.h
@ -16,26 +17,38 @@ add_qt_plugin(qvnc
        QT_NO_FOREACH
    LIBRARIES
        Qt::CorePrivate
-        Qt::Network
+        Qt::EventDispatcherSupportPrivate
+        Qt::FbSupportPrivate
+        Qt::FontDatabaseSupportPrivate
        Qt::GuiPrivate
        Qt::ServiceSupportPrivate
        Qt::ThemeSupportPrivate
-        Qt::FbSupportPrivate
-        Qt::EventDispatcherSupportPrivate
-        Qt::FontDatabaseSupportPrivate
-    # OTHER_FILES = "vnc.json"
-    # PLUGIN_CLASS_NAME = "QVncIntegrationPlugin"
-    # _LOADED = "qt_plugin"
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::EventDispatcherSupport
+        Qt::FbSupport
+        Qt::FontDatabaseSupport
+        Qt::Gui
+        Qt::Network
+        Qt::ServiceSupport
+        Qt::ThemeSupport
 )

+#### Keys ignored in scope 1:.:.:vnc.pro:<TRUE>:
+# OTHER_FILES = "vnc.json"
+# PLUGIN_CLASS_NAME = "QVncIntegrationPlugin"
+# PLUGIN_TYPE = "platforms"
+# _LOADED = "qt_plugin"
+
 ## Scopes:
 #####################################################################

 extend_target(qvnc CONDITION TARGET Qt::InputSupportPrivate
    LIBRARIES
        Qt::InputSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::InputSupport
 )
-#
-#extend_target(qvnc CONDITION NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN
-#    # PLUGIN_EXTENDS = "-"
-#)
+
+#### Keys ignored in scope 3:.:.:vnc.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
--- a/src/plugins/platforms/windows/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/windows/.prev_CMakeLists.txt
@ -6,6 +6,7 @@

 add_qt_plugin(qwindows
    TYPE platforms
+    CLASS_NAME QWindowsIntegrationPlugin
    SOURCES
        main.cpp
        qtwindowsglobal.h
@ -38,7 +39,7 @@ add_qt_plugin(qwindows
        QT_NO_CAST_FROM_ASCII
        QT_NO_FOREACH
    INCLUDE_DIRECTORIES
-        .
+        ${CMAKE_CURRENT_SOURCE_DIR}
    LIBRARIES
        Qt::CorePrivate
        Qt::EventDispatcherSupportPrivate
@ -76,6 +77,7 @@ add_qt_resource(qwindows "openglblacklists" PREFIX "/qt-project.org/windows/open
 #### Keys ignored in scope 1:.:.:windows.pro:<TRUE>:
 # OTHER_FILES = "windows.json"
 # PLUGIN_CLASS_NAME = "QWindowsIntegrationPlugin"
+# PLUGIN_TYPE = "platforms"
 # _LOADED = "qt_plugin"

 ## Scopes:
--- a/src/plugins/platforms/windows/CMakeLists.txt
+++ b/src/plugins/platforms/windows/CMakeLists.txt
@ -6,6 +6,7 @@

 add_qt_plugin(qwindows
    TYPE platforms
+    CLASS_NAME QWindowsIntegrationPlugin
    SOURCES
        main.cpp
        qtwindowsglobal.h
@ -38,7 +39,7 @@ add_qt_plugin(qwindows
        QT_NO_CAST_FROM_ASCII
        QT_NO_FOREACH
    INCLUDE_DIRECTORIES
-        .
+        ${CMAKE_CURRENT_SOURCE_DIR}
    LIBRARIES
        Qt::CorePrivate
        Qt::EventDispatcherSupportPrivate
@ -76,6 +77,7 @@ add_qt_resource(qwindows "openglblacklists" PREFIX "/qt-project.org/windows/open
 #### Keys ignored in scope 1:.:.:windows.pro:<TRUE>:
 # OTHER_FILES = "windows.json"
 # PLUGIN_CLASS_NAME = "QWindowsIntegrationPlugin"
+# PLUGIN_TYPE = "platforms"
 # _LOADED = "qt_plugin"

 ## Scopes:
--- a/src/plugins/platforms/xcb/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/xcb/.prev_CMakeLists.txt
@ -0,0 +1,263 @@
+# Generated from xcb.pro.
+
+#####################################################################
+## XcbQpa Module:
+#####################################################################
+
+add_qt_module(XcbQpa
+    NO_MODULE_HEADERS
+    SOURCES
+        gl_integrations/qxcbglintegration.cpp gl_integrations/qxcbglintegration.h
+        gl_integrations/qxcbglintegrationfactory.cpp gl_integrations/qxcbglintegrationfactory.h
+        gl_integrations/qxcbglintegrationplugin.h
+        gl_integrations/qxcbnativeinterfacehandler.cpp gl_integrations/qxcbnativeinterfacehandler.h
+        qxcbatom.cpp qxcbatom.h
+        qxcbbackingstore.cpp qxcbbackingstore.h
+        qxcbclipboard.cpp qxcbclipboard.h
+        qxcbconnection.cpp qxcbconnection.h
+        qxcbconnection_basic.cpp qxcbconnection_basic.h
+        qxcbconnection_screens.cpp
+        qxcbcursor.cpp qxcbcursor.h
+        qxcbeventdispatcher.cpp qxcbeventdispatcher.h
+        qxcbeventqueue.cpp qxcbeventqueue.h
+        qxcbimage.cpp qxcbimage.h
+        qxcbintegration.cpp qxcbintegration.h
+        qxcbkeyboard.cpp qxcbkeyboard.h
+        qxcbmime.cpp qxcbmime.h
+        qxcbnativeinterface.cpp qxcbnativeinterface.h
+        qxcbobject.h
+        qxcbscreen.cpp qxcbscreen.h
+        qxcbsystemtraytracker.cpp qxcbsystemtraytracker.h
+        qxcbwindow.cpp qxcbwindow.h
+        qxcbwmsupport.cpp qxcbwmsupport.h
+        qxcbxsettings.cpp qxcbxsettings.h
+    DEFINES
+        QT_BUILD_XCB_PLUGIN
+        QT_NO_FOREACH
+    INCLUDE_DIRECTORIES
+        gl_integrations
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::EdidSupportPrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::GuiPrivate
+        Qt::ServiceSupportPrivate
+        Qt::ThemeSupportPrivate
+        Qt::XkbCommonSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::EdidSupport
+        Qt::FontDatabaseSupport
+        Qt::Gui
+        Qt::ServiceSupport
+        Qt::ThemeSupport
+        Qt::XkbCommonSupport
+        XCB::ICCCM
+        XCB::IMAGE
+        XCB::KEYSYMS
+        XCB::RANDR
+        XCB::RENDER
+        XCB::RENDERUTIL
+        XCB::SHAPE
+        XCB::SHM
+        XCB::SYNC
+        XCB::XCB
+        XCB::XFIXES
+        XCB::XINERAMA
+        XKB::XKB
+)
+
+#### Keys ignored in scope 3:.:.:xcb_qpa_lib.pro:<TRUE>:
+# CONFIG = "no_module_headers" "internal_module"
+# _LOADED = "qt_build_paths" "qt_module"
+
+## Scopes:
+#####################################################################
+
+extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate
+    LIBRARIES
+        Qt::LinuxAccessibilitySupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::LinuxAccessibilitySupport
+)
+
+extend_target(XcbQpa CONDITION QT_FEATURE_vulkan
+    SOURCES
+        qxcbvulkaninstance.cpp qxcbvulkaninstance.h
+        qxcbvulkanwindow.cpp qxcbvulkanwindow.h
+    LIBRARIES
+        Qt::VulkanSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::VulkanSupport
+)
+
+extend_target(XcbQpa CONDITION QT_FEATURE_glib
+    LIBRARIES
+        GLIB2::GLIB2
+)
+
+extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop
+    SOURCES
+        qxcbdrag.cpp qxcbdrag.h
+)
+
+extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib
+    PUBLIC_LIBRARIES
+        X11::XCB
+)
+
+extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xinput
+    SOURCES
+        qxcbconnection_xi2.cpp
+    PUBLIC_LIBRARIES
+        XCB::XINPUT
+)
+
+extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm
+    SOURCES
+        qxcbsessionmanager.cpp qxcbsessionmanager.h
+    PUBLIC_LIBRARIES
+        ${X11_SM_LIB} ${X11_ICE_LIB}
+)
+
+extend_target(XcbQpa CONDITION QT_FEATURE_xkb
+    PUBLIC_LIBRARIES
+        XCB::XKB
+        XKB::XKB
+)
+
+extend_target(XcbQpa CONDITION QT_FEATURE_dlopen
+    PUBLIC_LIBRARIES
+        ${CMAKE_DL_LIBS}
+)
+
+extend_target(XcbQpa CONDITION CLANG AND NOT ICC
+    COMPILE_OPTIONS
+        -ftemplate-depth=1024
+)
+
+extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting
+    SOURCES
+        nativepainting/qbackingstore_x11.cpp nativepainting/qbackingstore_x11_p.h
+        nativepainting/qcolormap_x11.cpp nativepainting/qcolormap_x11_p.h
+        nativepainting/qpaintengine_x11.cpp nativepainting/qpaintengine_x11_p.h
+        nativepainting/qpixmap_x11.cpp nativepainting/qpixmap_x11_p.h
+        nativepainting/qt_x11_p.h
+        nativepainting/qtessellator.cpp nativepainting/qtessellator_p.h
+        nativepainting/qxcbnativepainting.cpp nativepainting/qxcbnativepainting.h
+    INCLUDE_DIRECTORIES
+        nativepainting
+)
+
+extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender
+    PUBLIC_LIBRARIES
+        PkgConfig::XRender
+)
+
+extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting
+    LIBRARIES
+        WrapFreetype::WrapFreetype
+)
+#####################################################################
+## qxcb Plugin:
+#####################################################################
+
+add_qt_plugin(qxcb
+    TYPE platforms
+    CLASS_NAME QXcbIntegrationPlugin
+    SOURCES
+        qxcbmain.cpp
+    DEFINES
+        QT_NO_FOREACH
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::XcbQpaPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::XcbQpa
+)
+
+#### Keys ignored in scope 24:.:.:xcb-plugin.pro:<TRUE>:
+# OTHER_FILES = "xcb.json" "README"
+# PLUGIN_CLASS_NAME = "QXcbIntegrationPlugin"
+# PLUGIN_TYPE = "platforms"
+# _LOADED = "qt_plugin"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 25:.:.:xcb-plugin.pro:APPLE_OSX:
+# CONFIG = "no_app_extension_api_only"
+
+#### Keys ignored in scope 26:.:.:xcb-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
+add_subdirectory(gl_integrations)
+
+if(NOT ON)
+    add_subdirectory(xcb-static)
+endif()
+
+    if(TARGET Qt::LinuxAccessibilitySupportPrivate)
+    endif()
+
+    if(QT_FEATURE_vulkan)
+    endif()
+
+    if(QT_FEATURE_glib)
+    endif()
+
+    if(QT_FEATURE_draganddrop)
+    endif()
+
+    if(QT_FEATURE_xcb_xlib)
+    endif()
+
+    if(QT_FEATURE_xcb_xinput)
+    endif()
+
+    if(QT_FEATURE_xcb_sm)
+    endif()
+
+    if(QT_FEATURE_vulkan)
+    endif()
+
+    if(NOT ON)
+    endif()
+
+    else()
+
+        if(QT_FEATURE_xcb_xinput)
+        endif()
+    endif()
+
+    if(QT_FEATURE_xkb)
+
+        if(ON)
+        endif()
+    endif()
+
+    if(QT_FEATURE_dlopen)
+    endif()
+
+    if(CLANG AND NOT ICC)
+    endif()
+
+    if(QT_FEATURE_xcb_native_painting)
+
+        if(QT_FEATURE_xrender)
+        endif()
+
+        if(QT_FEATURE_fontconfig)
+        endif()
+    endif()
+
+    if(QT_FEATURE_xcb_xinput)
+    endif()
+
+    if(APPLE_OSX)
+    endif()
+
+    if(NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN)
+    endif()
--- a/src/plugins/platforms/xcb/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/CMakeLists.txt
@ -54,8 +54,8 @@ add_qt_module(XcbQpa
        qxcbwmsupport.cpp qxcbwmsupport.h
        qxcbxsettings.cpp qxcbxsettings.h
    DEFINES
-        QT_NO_FOREACH
        QT_BUILD_XCB_PLUGIN
+        QT_NO_FOREACH
    INCLUDE_DIRECTORIES
        gl_integrations
    LIBRARIES
@ -68,7 +68,6 @@ add_qt_module(XcbQpa
        Qt::XkbCommonSupportPrivate
        PkgConfig::XKB_COMMON_X11 # special case
    PUBLIC_LIBRARIES
-        ${CMAKE_DL_LIBS}
        Qt::Core
        Qt::EdidSupport
        Qt::FontDatabaseSupport
@ -151,9 +150,14 @@ extend_target(XcbQpa CONDITION QT_FEATURE_xkb
        XKB::XKB
 )

+extend_target(XcbQpa CONDITION QT_FEATURE_dlopen
+    PUBLIC_LIBRARIES
+        ${CMAKE_DL_LIBS}
+)
+
 extend_target(XcbQpa CONDITION CLANG AND NOT ICC
    COMPILE_OPTIONS
-        "-ftemplate-depth=1024"
+        -ftemplate-depth=1024
 )

 extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting
@ -184,6 +188,7 @@ extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_p

 add_qt_plugin(qxcb
    TYPE platforms
+    CLASS_NAME QXcbIntegrationPlugin
    SOURCES
        qxcbmain.cpp
    DEFINES
@ -201,6 +206,7 @@ add_qt_plugin(qxcb
 #### Keys ignored in scope 24:.:.:xcb-plugin.pro:<TRUE>:
 # OTHER_FILES = "xcb.json" "README"
 # PLUGIN_CLASS_NAME = "QXcbIntegrationPlugin"
+# PLUGIN_TYPE = "platforms"
 # _LOADED = "qt_plugin"

 ## Scopes:
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt
@ -6,6 +6,7 @@

 add_qt_plugin(qxcb-egl-integration
    TYPE xcbglintegrations
+    CLASS_NAME QXcbEglIntegrationPlugin
    SOURCES
        qxcbeglcontext.h
        qxcbeglintegration.cpp qxcbeglintegration.h
@ -29,7 +30,8 @@ add_qt_plugin(qxcb-egl-integration
        Qt::XcbQpa
 )

-#### Keys ignored in scope 1:.:.:./xcb_egl.pro:<TRUE>:
+#### Keys ignored in scope 1:.:.:xcb_egl.pro:<TRUE>:
 # CONFIG = "egl"
 # PLUGIN_CLASS_NAME = "QXcbEglIntegrationPlugin"
+# PLUGIN_TYPE = "xcbglintegrations"
 # _LOADED = "qt_plugin" "qt_build_paths"
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
@ -6,6 +6,7 @@

 add_qt_plugin(qxcb-glx-integration
    TYPE xcbglintegrations
+    CLASS_NAME QXcbGlxIntegrationPlugin
    SOURCES
        qglxintegration.cpp qglxintegration.h
        qxcbglxintegration.cpp qxcbglxintegration.h
@ -29,8 +30,9 @@ add_qt_plugin(qxcb-glx-integration
        Qt::XcbQpa
 )

-#### Keys ignored in scope 1:.:.:./xcb_glx.pro:<TRUE>:
+#### Keys ignored in scope 1:.:.:xcb_glx.pro:<TRUE>:
 # PLUGIN_CLASS_NAME = "QXcbGlxIntegrationPlugin"
+# PLUGIN_TYPE = "xcbglintegrations"
 # _LOADED = "qt_plugin" "qt_build_paths"

 ## Scopes:
@ -41,7 +43,7 @@ extend_target(qxcb-glx-integration CONDITION QT_FEATURE_xcb_glx
        XCB::GLX
 )

-extend_target(qxcb-glx-integration CONDITION NOT static
+extend_target(qxcb-glx-integration CONDITION QT_FEATURE_dlopen AND NOT static
    PUBLIC_LIBRARIES
        ${CMAKE_DL_LIBS}
 )