diff --git a/src/plugins/platforms/.prev_CMakeLists.txt b/src/plugins/platforms/.prev_CMakeLists.txt
index 6727afcb89..947efaaf63 100644
--- a/src/plugins/platforms/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/.prev_CMakeLists.txt
@@ -18,13 +18,13 @@ endif()
 if(MACOS)
     add_subdirectory(cocoa)
 endif()
-if(QT_FEATURE_direct3d9 AND WIN32 AND NOT WINRT)
+if(WIN32 AND NOT WINRT)
     add_subdirectory(windows)
 endif()
-if(QT_FEATURE_direct3d11 AND WINRT)
+if(WINRT)
     add_subdirectory(winrt)
 endif()
-if(QT_FEATURE_direct2d1_1 AND QT_FEATURE_direct3d11_1 AND QT_FEATURE_directwrite1)
+if(QT_FEATURE_direct2d1_1 AND QT_FEATURE_directwrite1)
     add_subdirectory(direct2d)
 endif()
 if(QNX)
diff --git a/src/plugins/platforms/android/.prev_CMakeLists.txt b/src/plugins/platforms/android/.prev_CMakeLists.txt
index 4f066771d8..c18719ec72 100644
--- a/src/plugins/platforms/android/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/android/.prev_CMakeLists.txt
@@ -61,17 +61,9 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan
-    SOURCES
-        qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h
-        qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h
+qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_opengl
     PUBLIC_LIBRARIES
-        Qt::VulkanSupportPrivate
-)
-
-qt_extend_target(QAndroidIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate
-    PUBLIC_LIBRARIES
-        Qt::PlatformCompositorSupportPrivate
+        Qt::OpenGLPrivate
 )
 
 qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets
@@ -83,3 +75,9 @@ qt_extend_target(QAndroidIntegrationPlugin CONDITION NOT QT_FEATURE_android_styl
     SOURCES
         extract-dummy.cpp
 )
+
+qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan
+    SOURCES
+        qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h
+        qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h
+)
diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt
index 3d61c1e959..5c754a9202 100644
--- a/src/plugins/platforms/android/CMakeLists.txt
+++ b/src/plugins/platforms/android/CMakeLists.txt
@@ -70,11 +70,6 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan
-    SOURCES
-        qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h
-        qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h
-)
 
 qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_opengl
     PUBLIC_LIBRARIES
@@ -90,3 +85,9 @@ qt_extend_target(QAndroidIntegrationPlugin CONDITION NOT QT_FEATURE_android_styl
     SOURCES
         extract-dummy.cpp
 )
+
+qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan
+    SOURCES
+        qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h
+        qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h
+)
diff --git a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt
index bb7e34c285..e1e6c49367 100644
--- a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt
@@ -52,11 +52,8 @@ qt_internal_add_plugin(QCocoaIntegrationPlugin
         ${FWMetal}
         ${FWQuartzCore}
         Cups::Cups
-        Qt::ClipboardSupportPrivate
         Qt::Core
         Qt::CorePrivate
-        Qt::FontDatabaseSupportPrivate
-        Qt::GraphicsSupportPrivate
         Qt::Gui
         Qt::GuiPrivate
         Qt::ThemeSupportPrivate
@@ -86,13 +83,13 @@ qt_add_resource(QCocoaIntegrationPlugin "qcocoaresources"
 qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl
     SOURCES
         qcocoaglcontext.h qcocoaglcontext.mm
+    PUBLIC_LIBRARIES
+        Qt::OpenGLPrivate
 )
 
 qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_vulkan
     SOURCES
         qcocoavulkaninstance.h qcocoavulkaninstance.mm
-    PUBLIC_LIBRARIES
-        Qt::VulkanSupportPrivate
 )
 
 qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_accessibility
@@ -108,11 +105,6 @@ qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager
         qcocoasessionmanager.cpp qcocoasessionmanager.h
 )
 
-qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate
-    PUBLIC_LIBRARIES
-        Qt::PlatformCompositorSupportPrivate
-)
-
 qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::Widgets
     SOURCES
         qpaintengine_mac.mm qpaintengine_mac_p.h
@@ -120,7 +112,7 @@ qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::Widgets
         Qt::WidgetsPrivate
 )
 
-#### Keys ignored in scope 8:.:.:cocoa.pro:TARGET Qt::Widgets:
+#### Keys ignored in scope 7:.:.:cocoa.pro:TARGET Qt::Widgets:
 # QT_FOR_CONFIG = "widgets"
 
 qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets
@@ -147,5 +139,5 @@ qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_fontdialog AND TAR
         qcocoafontdialoghelper.h qcocoafontdialoghelper.mm
 )
 
-#### Keys ignored in scope 13:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 12:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt
index 599359b09c..9f6f1d965d 100644
--- a/src/plugins/platforms/cocoa/CMakeLists.txt
+++ b/src/plugins/platforms/cocoa/CMakeLists.txt
@@ -91,6 +91,8 @@ qt_add_resource(QCocoaIntegrationPlugin "qcocoaresources"
 qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl
     SOURCES
         qcocoaglcontext.h qcocoaglcontext.mm
+    PUBLIC_LIBRARIES
+        Qt::OpenGLPrivate
 )
 
 qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_vulkan
@@ -111,11 +113,6 @@ qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager
         qcocoasessionmanager.cpp qcocoasessionmanager.h
 )
 
-qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl
-    PUBLIC_LIBRARIES
-        Qt::OpenGLPrivate
-)
-
 qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::Widgets
     SOURCES
         qpaintengine_mac.mm qpaintengine_mac_p.h
@@ -123,7 +120,7 @@ qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::Widgets
         Qt::WidgetsPrivate
 )
 
-#### Keys ignored in scope 8:.:.:cocoa.pro:TARGET Qt::Widgets:
+#### Keys ignored in scope 7:.:.:cocoa.pro:TARGET Qt::Widgets:
 # QT_FOR_CONFIG = "widgets"
 
 qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets
@@ -150,5 +147,5 @@ qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_fontdialog AND TAR
         qcocoafontdialoghelper.h qcocoafontdialoghelper.mm
 )
 
-#### Keys ignored in scope 13:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 12:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
index 896b8cd3e8..6b4582cf25 100644
--- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
@@ -42,17 +42,12 @@ qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate
         Qt::InputSupportPrivate
 )
 
-qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupportPrivate
-    PUBLIC_LIBRARIES
-        Qt::PlatformCompositorSupportPrivate
-)
-
-qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan
+qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
     SOURCES
-        api/vulkan/qeglfsvulkaninstance.cpp api/vulkan/qeglfsvulkaninstance_p.h
-        api/vulkan/qeglfsvulkanwindow.cpp api/vulkan/qeglfsvulkanwindow_p.h
+        api/qeglfscontext.cpp api/qeglfscontext_p.h
+        api/qeglfscursor.cpp api/qeglfscursor_p.h
     PUBLIC_LIBRARIES
-        Qt::VulkanSupportPrivate
+        Qt::OpenGLPrivate
 )
 
 qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY
@@ -80,18 +75,16 @@ if(QT_FEATURE_cursor)
     )
 endif()
 
-qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
+qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan
     SOURCES
-        api/qeglfscontext.cpp api/qeglfscontext_p.h
-        api/qeglfscursor.cpp api/qeglfscursor_p.h
-    PUBLIC_LIBRARIES
-        Qt::OpenGLPrivate
+        api/vulkan/qeglfsvulkaninstance.cpp api/vulkan/qeglfsvulkaninstance_p.h
+        api/vulkan/qeglfsvulkanwindow.cpp api/vulkan/qeglfsvulkanwindow_p.h
 )
 #####################################################################
 ## QEglFSIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QEglFSIntegrationPlugin
+qt_internal_add_plugin(QEglFSIntegrationPlugin
     OUTPUT_NAME qeglfs
     TYPE platforms
     SOURCES
@@ -104,12 +97,12 @@ qt_add_plugin(QEglFSIntegrationPlugin
         Qt::EglFSDeviceIntegrationPrivate
 )
 
-#### Keys ignored in scope 13:.:.:eglfs-plugin.pro:<TRUE>:
+#### Keys ignored in scope 12:.:.:eglfs-plugin.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/eglfs.json"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 14:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 13:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
 add_subdirectory(deviceintegration)
diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt
index 622fbe6037..ebed6cd4bd 100644
--- a/src/plugins/platforms/eglfs/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/CMakeLists.txt
@@ -45,21 +45,27 @@ qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate
 )
 
 qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
+    SOURCES
+        api/qeglfscontext.cpp api/qeglfscontext_p.h
+        api/qeglfscursor.cpp api/qeglfscursor_p.h
     PUBLIC_LIBRARIES
         Qt::OpenGLPrivate
 )
 
-qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan
-    SOURCES
-        api/vulkan/qeglfsvulkaninstance.cpp api/vulkan/qeglfsvulkaninstance_p.h
-        api/vulkan/qeglfsvulkanwindow.cpp api/vulkan/qeglfsvulkanwindow_p.h
-)
+# special case begin
+# comment out
+#qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY
+    #DEFINES
+        #EGLFS_PLATFORM_HOOKS
+#)
 
-# special case:
-# extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY ...
-# extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY ...
+#qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY
+    #DEFINES
+        #EGLFS_PREFERRED_PLUGIN=
+#)
+# special case end
 
-if(QT_FEATURE_cursor) # special case
+if(QT_FEATURE_cursor)
     # Resources:
     set(cursor_resource_files
         "cursor-atlas.png"
@@ -74,18 +80,16 @@ if(QT_FEATURE_cursor) # special case
     )
 endif()
 
-qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
+qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan
     SOURCES
-        api/qeglfscontext.cpp api/qeglfscontext_p.h
-        api/qeglfscursor.cpp api/qeglfscursor_p.h
-    PUBLIC_LIBRARIES
-        Qt::OpenGLPrivate
+        api/vulkan/qeglfsvulkaninstance.cpp api/vulkan/qeglfsvulkaninstance_p.h
+        api/vulkan/qeglfsvulkanwindow.cpp api/vulkan/qeglfsvulkanwindow_p.h
 )
 #####################################################################
 ## QEglFSIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QEglFSIntegrationPlugin
+qt_internal_add_plugin(QEglFSIntegrationPlugin
     OUTPUT_NAME qeglfs
     TYPE platforms
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES eglfs # special case
@@ -101,12 +105,12 @@ qt_add_plugin(QEglFSIntegrationPlugin
         EGL::EGL # special case
 )
 
-#### Keys ignored in scope 13:.:.:eglfs-plugin.pro:<TRUE>:
+#### Keys ignored in scope 12:.:.:eglfs-plugin.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/eglfs.json"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 14:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 13:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
 add_subdirectory(deviceintegration)
diff --git a/src/plugins/platforms/ios/.prev_CMakeLists.txt b/src/plugins/platforms/ios/.prev_CMakeLists.txt
index 8916e1772b..d38f7c813e 100644
--- a/src/plugins/platforms/ios/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/ios/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QIOSIntegrationPlugin Plugin:
 #####################################################################
 
-add_qt_plugin(QIOSIntegrationPlugin
+qt_internal_add_plugin(QIOSIntegrationPlugin
     OUTPUT_NAME qios
     TYPE platforms
     SOURCES
@@ -31,10 +31,7 @@ add_qt_plugin(QIOSIntegrationPlugin
         ${FWFoundation}
         ${FWQuartzCore}
         ${FWUIKit}
-        Qt::ClipboardSupportPrivate
         Qt::CorePrivate
-        Qt::FontDatabaseSupportPrivate
-        Qt::GraphicsSupportPrivate
         Qt::GuiPrivate
 )
 
@@ -44,12 +41,12 @@ add_qt_plugin(QIOSIntegrationPlugin
 ## Scopes:
 #####################################################################
 
-extend_target(QIOSIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate
+qt_extend_target(QIOSIntegrationPlugin CONDITION QT_FEATURE_opengl
     PUBLIC_LIBRARIES
-        Qt::PlatformCompositorSupportPrivate
+        Qt::OpenGLPrivate
 )
 
-extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS
+qt_extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS
     SOURCES
         qiosclipboard.h qiosclipboard.mm
         qiosdocumentpickercontroller.h qiosdocumentpickercontroller.mm
diff --git a/src/plugins/platforms/ios/CMakeLists.txt b/src/plugins/platforms/ios/CMakeLists.txt
index 6acff8b074..06c64e10ad 100644
--- a/src/plugins/platforms/ios/CMakeLists.txt
+++ b/src/plugins/platforms/ios/CMakeLists.txt
@@ -1,10 +1,10 @@
-# Generated from kernel.pro.
+# Generated from ios.pro.
 
 #####################################################################
 ## QIOSIntegrationPlugin Plugin:
 #####################################################################
 
-add_qt_plugin(QIOSIntegrationPlugin
+qt_internal_add_plugin(QIOSIntegrationPlugin
     OUTPUT_NAME qios
     TYPE platforms
     SOURCES
@@ -31,28 +31,25 @@ add_qt_plugin(QIOSIntegrationPlugin
         ${FWFoundation}
         ${FWQuartzCore}
         ${FWUIKit}
-        Qt::Core
         Qt::CorePrivate
-        Qt::Gui
         Qt::GuiPrivate
 )
 
 # special case begin
 qt_disable_apple_app_extension_api_only(QIOSIntegrationPlugin)
 # special case end
-
-#### Keys ignored in scope 1:.:.:kernel.pro:<TRUE>:
+#### Keys ignored in scope 2:.:.:kernel.pro:<TRUE>:
 # OTHER_FILES = "quiview_textinput.mm" "quiview_accessibility.mm"
 
 ## Scopes:
 #####################################################################
 
-extend_target(QIOSIntegrationPlugin CONDITION QT_FEATURE_opengl
+qt_extend_target(QIOSIntegrationPlugin CONDITION QT_FEATURE_opengl
     PUBLIC_LIBRARIES
         Qt::OpenGLPrivate
 )
 
-extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS
+qt_extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS
     SOURCES
         qiosclipboard.h qiosclipboard.mm
         qiosdocumentpickercontroller.h qiosdocumentpickercontroller.mm
@@ -64,5 +61,6 @@ extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS
         ${FWAssetsLibrary}
 )
 
-#### Keys ignored in scope 5:.:.:kernel.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 6:.:.:kernel.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
+add_subdirectory(optional)
diff --git a/src/plugins/platforms/minimal/.prev_CMakeLists.txt b/src/plugins/platforms/minimal/.prev_CMakeLists.txt
index e33bbc6815..e0ecf464cf 100644
--- a/src/plugins/platforms/minimal/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/minimal/.prev_CMakeLists.txt
@@ -17,7 +17,6 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin
         Qt::Core
         Qt::CorePrivate
         Qt::EventDispatcherSupportPrivate
-        Qt::FontDatabaseSupportPrivate
         Qt::Gui
         Qt::GuiPrivate
 )
@@ -28,10 +27,15 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin
 ## Scopes:
 #####################################################################
 
+qt_extend_target(QMinimalIntegrationPlugin CONDITION NOT APPLE
+    PUBLIC_LIBRARIES
+        Qt::FontDatabaseSupportPrivate
+)
+
 qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype
     LIBRARIES
         WrapFreetype::WrapFreetype
 )
 
-#### Keys ignored in scope 3:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 4:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/minimal/CMakeLists.txt b/src/plugins/platforms/minimal/CMakeLists.txt
index b2ce151b55..9fd20bd3c4 100644
--- a/src/plugins/platforms/minimal/CMakeLists.txt
+++ b/src/plugins/platforms/minimal/CMakeLists.txt
@@ -20,7 +20,6 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin
         Qt::Core
         Qt::CorePrivate
         Qt::EventDispatcherSupportPrivate
-        Qt::FontDatabaseSupportPrivate
         Qt::Gui
         Qt::GuiPrivate
 )
@@ -31,10 +30,15 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin
 ## Scopes:
 #####################################################################
 
+qt_extend_target(QMinimalIntegrationPlugin CONDITION NOT APPLE
+    PUBLIC_LIBRARIES
+        Qt::FontDatabaseSupportPrivate
+)
+
 qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype
     LIBRARIES
         WrapFreetype::WrapFreetype
 )
 
-#### Keys ignored in scope 3:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 4:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
index 45e10e6239..06861088b9 100644
--- a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
@@ -18,7 +18,6 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin
         Qt::Core
         Qt::CorePrivate
         Qt::EventDispatcherSupportPrivate
-        Qt::FontDatabaseSupportPrivate
         Qt::Gui
         Qt::GuiPrivate
 )
@@ -29,6 +28,11 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin
 ## Scopes:
 #####################################################################
 
+qt_extend_target(QOffscreenIntegrationPlugin CONDITION NOT APPLE
+    PUBLIC_LIBRARIES
+        Qt::FontDatabaseSupportPrivate
+)
+
 qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
     SOURCES
         qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h
@@ -36,5 +40,5 @@ qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_
         Qt::GlxSupportPrivate
 )
 
-#### Keys ignored in scope 3:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 4:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/offscreen/CMakeLists.txt b/src/plugins/platforms/offscreen/CMakeLists.txt
index 7387e083b6..5d9dd0083c 100644
--- a/src/plugins/platforms/offscreen/CMakeLists.txt
+++ b/src/plugins/platforms/offscreen/CMakeLists.txt
@@ -19,7 +19,6 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin
         Qt::Core
         Qt::CorePrivate
         Qt::EventDispatcherSupportPrivate
-        Qt::FontDatabaseSupportPrivate
         Qt::Gui
         Qt::GuiPrivate
 )
@@ -30,6 +29,11 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin
 ## Scopes:
 #####################################################################
 
+qt_extend_target(QOffscreenIntegrationPlugin CONDITION NOT APPLE
+    PUBLIC_LIBRARIES
+        Qt::FontDatabaseSupportPrivate
+)
+
 qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
     SOURCES
         qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h
@@ -37,5 +41,5 @@ qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_
         Qt::GlxSupportPrivate
 )
 
-#### Keys ignored in scope 3:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 4:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/windows/.prev_CMakeLists.txt b/src/plugins/platforms/windows/.prev_CMakeLists.txt
index c87a51e04a..eb9d46aa85 100644
--- a/src/plugins/platforms/windows/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/windows/.prev_CMakeLists.txt
@@ -42,7 +42,6 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin
         ${CMAKE_CURRENT_SOURCE_DIR}
     LIBRARIES
         advapi32
-        d3d9
         gdi32
         ole32
         shell32
@@ -86,9 +85,12 @@ qt_add_resource(QWindowsIntegrationPlugin "openglblacklists"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl
+    SOURCES
+        qwindowsglcontext.cpp qwindowsglcontext.h
+        qwindowsopenglcontext.h
     PUBLIC_LIBRARIES
-        Qt::PlatformCompositorSupportPrivate
+        Qt::OpenGLPrivate
 )
 
 qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
@@ -116,20 +118,13 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
         Qt::AccessibilitySupportPrivate
 )
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan
-    SOURCES
-        qwindowsvulkaninstance.cpp qwindowsvulkaninstance.h
-    PUBLIC_LIBRARIES
-        Qt::VulkanSupportPrivate
-)
-
 qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_directwrite3
     DEFINES
         QT_USE_DIRECTWRITE2
         QT_USE_DIRECTWRITE3
 )
 
-#### Keys ignored in scope 6:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 5:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
 
 qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl
@@ -142,17 +137,16 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION MINGW
         uuid
 )
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl
-    SOURCES
-        qwindowsglcontext.cpp qwindowsglcontext.h
-        qwindowsopenglcontext.h
-)
-
 qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_systemtrayicon
     SOURCES
         qwindowssystemtrayicon.cpp qwindowssystemtrayicon.h
 )
 
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan
+    SOURCES
+        qwindowsvulkaninstance.cpp qwindowsvulkaninstance.h
+)
+
 qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard
     SOURCES
         qwindowsclipboard.cpp qwindowsclipboard.h
@@ -209,11 +203,6 @@ if(QT_FEATURE_imageformat_png)
     )
 endif()
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate
-    PUBLIC_LIBRARIES
-        Qt::WindowsUIAutomationSupportPrivate
-)
-
 qt_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility
     PUBLIC_LIBRARIES
         uuid
diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt
index cb79a5d9d0..486654cfe1 100644
--- a/src/plugins/platforms/windows/CMakeLists.txt
+++ b/src/plugins/platforms/windows/CMakeLists.txt
@@ -87,6 +87,9 @@ qt_add_resource(QWindowsIntegrationPlugin "openglblacklists"
 #####################################################################
 
 qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl
+    SOURCES
+        qwindowsglcontext.cpp qwindowsglcontext.h
+        qwindowsopenglcontext.h
     PUBLIC_LIBRARIES
         Qt::OpenGLPrivate
 )
@@ -116,18 +119,13 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
         Qt::AccessibilitySupportPrivate
 )
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan
-    SOURCES
-        qwindowsvulkaninstance.cpp qwindowsvulkaninstance.h
-)
-
 qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_directwrite3
     DEFINES
         QT_USE_DIRECTWRITE2
         QT_USE_DIRECTWRITE3
 )
 
-#### Keys ignored in scope 6:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 5:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
 
 qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl
@@ -140,17 +138,16 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION MINGW
         uuid
 )
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl
-    SOURCES
-        qwindowsglcontext.cpp qwindowsglcontext.h
-        qwindowsopenglcontext.h
-)
-
 qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_systemtrayicon
     SOURCES
         qwindowssystemtrayicon.cpp qwindowssystemtrayicon.h
 )
 
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan
+    SOURCES
+        qwindowsvulkaninstance.cpp qwindowsvulkaninstance.h
+)
+
 qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard
     SOURCES
         qwindowsclipboard.cpp qwindowsclipboard.h
@@ -207,11 +204,6 @@ if(QT_FEATURE_imageformat_png)
     )
 endif()
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate
-    PUBLIC_LIBRARIES
-        Qt::WindowsUIAutomationSupportPrivate
-)
-
 qt_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility
     PUBLIC_LIBRARIES
         uuid
diff --git a/src/plugins/platforms/xcb/.prev_CMakeLists.txt b/src/plugins/platforms/xcb/.prev_CMakeLists.txt
index 85290fae84..e459d27146 100644
--- a/src/plugins/platforms/xcb/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/xcb/.prev_CMakeLists.txt
@@ -67,9 +67,9 @@ qt_add_module(XcbQpa
 ## Scopes:
 #####################################################################
 
-qt_extend_target(XcbQpa CONDITION TARGET Qt::PlatformCompositorSupportPrivate
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_opengl
     PUBLIC_LIBRARIES
-        Qt::PlatformCompositorSupportPrivate
+        Qt::OpenGLPrivate
 )
 
 qt_extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate
@@ -77,14 +77,6 @@ qt_extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate
         Qt::LinuxAccessibilitySupportPrivate
 )
 
-qt_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan
-    SOURCES
-        qxcbvulkaninstance.cpp qxcbvulkaninstance.h
-        qxcbvulkanwindow.cpp qxcbvulkanwindow.h
-    PUBLIC_LIBRARIES
-        Qt::VulkanSupportPrivate
-)
-
 qt_extend_target(XcbQpa CONDITION QT_FEATURE_glib
     LIBRARIES
         GLIB2::GLIB2
@@ -107,6 +99,12 @@ qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm
         ${X11_SM_LIB} ${X11_ICE_LIB}
 )
 
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan
+    SOURCES
+        qxcbvulkaninstance.cpp qxcbvulkaninstance.h
+        qxcbvulkanwindow.cpp qxcbvulkanwindow.h
+)
+
 qt_extend_target(XcbQpa CONDITION QT_FEATURE_dlopen
     PUBLIC_LIBRARIES
         ${CMAKE_DL_LIBS}
@@ -143,7 +141,7 @@ qt_extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_nativ
 ## QXcbIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QXcbIntegrationPlugin
+qt_internal_add_plugin(QXcbIntegrationPlugin
     OUTPUT_NAME qxcb
     TYPE platforms
     SOURCES
@@ -156,12 +154,12 @@ qt_add_plugin(QXcbIntegrationPlugin
         Qt::XcbQpaPrivate
 )
 
-#### Keys ignored in scope 20:.:.:xcb-plugin.pro:<TRUE>:
+#### Keys ignored in scope 19:.:.:xcb-plugin.pro:<TRUE>:
 # OTHER_FILES = "xcb.json" "README"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 22:.:.:xcb-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 21:.:.:xcb-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
 add_subdirectory(gl_integrations)
diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt
index 6e4388cc3f..65c085ff10 100644
--- a/src/plugins/platforms/xcb/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/CMakeLists.txt
@@ -81,12 +81,6 @@ qt_extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate
         Qt::LinuxAccessibilitySupportPrivate
 )
 
-qt_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan
-    SOURCES
-        qxcbvulkaninstance.cpp qxcbvulkaninstance.h
-        qxcbvulkanwindow.cpp qxcbvulkanwindow.h
-)
-
 qt_extend_target(XcbQpa CONDITION QT_FEATURE_glib
     LIBRARIES
         GLIB2::GLIB2
@@ -115,6 +109,12 @@ qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm
         ${X11_SM_LIB} ${X11_ICE_LIB}
 )
 
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan
+    SOURCES
+        qxcbvulkaninstance.cpp qxcbvulkaninstance.h
+        qxcbvulkanwindow.cpp qxcbvulkanwindow.h
+)
+
 qt_extend_target(XcbQpa CONDITION QT_FEATURE_dlopen
     PUBLIC_LIBRARIES
         ${CMAKE_DL_LIBS}
@@ -166,7 +166,7 @@ endif()
 ## QXcbIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QXcbIntegrationPlugin
+qt_internal_add_plugin(QXcbIntegrationPlugin
     OUTPUT_NAME qxcb
     TYPE platforms
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES xcb # special case
@@ -180,13 +180,13 @@ qt_add_plugin(QXcbIntegrationPlugin
         Qt::XcbQpaPrivate
 )
 
-#### Keys ignored in scope 20:.:.:xcb-plugin.pro:<TRUE>:
+#### Keys ignored in scope 19:.:.:xcb-plugin.pro:<TRUE>:
 # OTHER_FILES = "xcb.json" "README"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 22:.:.:xcb-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 21:.:.:xcb-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
 add_subdirectory(gl_integrations)
 if(OFF)
diff --git a/src/plugins/sqldrivers/.cmake.conf b/src/plugins/sqldrivers/.cmake.conf
new file mode 100644
index 0000000000..9305480451
--- /dev/null
+++ b/src/plugins/sqldrivers/.cmake.conf
@@ -0,0 +1 @@
+set(QT_REPO_MODULE_VERSION "6.0.0")
diff --git a/src/plugins/sqldrivers/.prev_CMakeLists.txt b/src/plugins/sqldrivers/.prev_CMakeLists.txt
index 8752cf701f..c613e352a0 100644
--- a/src/plugins/sqldrivers/.prev_CMakeLists.txt
+++ b/src/plugins/sqldrivers/.prev_CMakeLists.txt
@@ -2,8 +2,9 @@
 
 cmake_minimum_required(VERSION 3.15.0)
 
+include(.cmake.conf)
 project(ldrivers_FIXME
-    VERSION 6.0.0
+    VERSION "${QT_REPO_MODULE_VERSION}"
     DESCRIPTION "Qt ldrivers_FIXME Libraries"
     HOMEPAGE_URL "https://qt.io/"
     LANGUAGES CXX C
diff --git a/src/plugins/sqldrivers/CMakeLists.txt b/src/plugins/sqldrivers/CMakeLists.txt
index 8d46d68559..c47e8eeadc 100644
--- a/src/plugins/sqldrivers/CMakeLists.txt
+++ b/src/plugins/sqldrivers/CMakeLists.txt
@@ -3,8 +3,9 @@
 # special case begin
 if (NOT CMAKE_PROJECT_NAME STREQUAL "QtBase" AND NOT CMAKE_PROJECT_NAME STREQUAL "Qt")
     cmake_minimum_required(VERSION 3.17)
+    include(.cmake.conf)
     project(QSQLiteDriverPlugins
-        VERSION 6.0.0
+        VERSION "${QT_REPO_MODULE_VERSION}"
         DESCRIPTION "Qt6 SQL driver plugins"
         HOMEPAGE_URL "https://qt.io/"
         LANGUAGES CXX C ASM