CMake: Regenerate qtbase projects

In preparation for some further regeneration.

Also modify pro2cmake to add forgotten mapping for the
Qt::EglFsKmsGbmSupportPrivate module.

Change-Id: I92425c566c2b275b40eec8c652496290754ac385
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

13 files changed, 382 insertions, 33 deletions

diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt
index 48e6ef5afb..8405da6b52 100644
--- a/src/corelib/.prev_CMakeLists.txt
+++ b/src/corelib/.prev_CMakeLists.txt
@@ -985,7 +985,7 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_mimetype
         mimetypes/qmimetypeparser.cpp mimetypes/qmimetypeparser_p.h
 )
 
-#### Keys ignored in scope 172:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype:
+#### Keys ignored in scope 171:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype:
 # MIME_DATABASE = "mimetypes/mime/packages/freedesktop.org.xml"
 # OTHER_FILES = "$$MIME_DATABASE"
 
@@ -994,7 +994,7 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_mimetype AND QT_FEATURE_mime
         .rcc
 )
 
-#### Keys ignored in scope 173:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype_database:
+#### Keys ignored in scope 172:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype_database:
 # QMAKE_EXTRA_COMPILERS = "mimedb"
 # mimedb.commands = "${QMAKE_FILE_IN}" ">" "${QMAKE_FILE_OUT}"
 # mimedb.depends = "$$PWD/mime/generate.pl"
@@ -1002,23 +1002,23 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_mimetype AND QT_FEATURE_mime
 # mimedb.output = "$$outpath/qmimeprovider_database.cpp"
 # mimedb.variable_out = "INCLUDED_SOURCES"
 
-#### Keys ignored in scope 174:.:mimetypes:mimetypes/mimetypes.pri:ANDROID:
+#### Keys ignored in scope 173:.:mimetypes:mimetypes/mimetypes.pri:ANDROID:
 # outpath = "$$outpath/$${QT_ARCH}"
 
-#### Keys ignored in scope 176:.:mimetypes:mimetypes/mimetypes.pri:(CMAKE_BUILD_TYPE STREQUAL Debug):
+#### Keys ignored in scope 175:.:mimetypes:mimetypes/mimetypes.pri:(CMAKE_BUILD_TYPE STREQUAL Debug):
 # outpath = "$$outpath/debug"
 
-#### Keys ignored in scope 177:.:mimetypes:mimetypes/mimetypes.pri:else:
+#### Keys ignored in scope 176:.:mimetypes:mimetypes/mimetypes.pri:else:
 # outpath = "$$outpath/release"
 
-#### Keys ignored in scope 178:.:mimetypes:mimetypes/mimetypes.pri:MAKEFILE_GENERATOR___equals___MSVC.NET OR MAKEFILE_GENERATOR___equals___MSBUILD OR QMAKE_SH_ISEMPTY:
+#### Keys ignored in scope 177:.:mimetypes:mimetypes/mimetypes.pri:MAKEFILE_GENERATOR___equals___MSVC.NET OR MAKEFILE_GENERATOR___equals___MSBUILD OR QMAKE_SH_ISEMPTY:
 # mimedb.commands = "cmd" "/c" "$$shell_path($$PWD/mime/generate.bat)"
 # mimedb.depends = "$$PWD/mime/generate.bat" "$$PWD/mime/hexdump.ps1"
 
-#### Keys ignored in scope 179:.:mimetypes:mimetypes/mimetypes.pri:else:
+#### Keys ignored in scope 178:.:mimetypes:mimetypes/mimetypes.pri:else:
 # mimedb.commands = "perl" "$${mimedb.depends}"
 
-#### Keys ignored in scope 180:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_zstd:
+#### Keys ignored in scope 179:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_zstd:
 # mimedb.commands = "--zstd"
 
 qt_internal_extend_target(Core CONDITION WASM
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index 968d379277..bb005b189d 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -1102,7 +1102,7 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_mimetype
         mimetypes/qmimetypeparser.cpp mimetypes/qmimetypeparser_p.h
 )
 
-#### Keys ignored in scope 172:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype:
+#### Keys ignored in scope 171:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype:
 # MIME_DATABASE = "mimetypes/mime/packages/freedesktop.org.xml"
 # OTHER_FILES = "$$MIME_DATABASE"
 
@@ -1113,7 +1113,7 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_mimetype
 #)
 # special case end
 
-#### Keys ignored in scope 173:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype_database:
+#### Keys ignored in scope 172:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype_database:
 # QMAKE_EXTRA_COMPILERS = "mimedb"
 # mimedb.commands = "${QMAKE_FILE_IN}" ">" "${QMAKE_FILE_OUT}"
 # mimedb.depends = "$$PWD/mime/generate.pl"
@@ -1121,23 +1121,23 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_mimetype
 # mimedb.output = "$$outpath/qmimeprovider_database.cpp"
 # mimedb.variable_out = "INCLUDED_SOURCES"
 
-#### Keys ignored in scope 174:.:mimetypes:mimetypes/mimetypes.pri:ANDROID:
+#### Keys ignored in scope 173:.:mimetypes:mimetypes/mimetypes.pri:ANDROID:
 # outpath = "$$outpath/$${QT_ARCH}"
 
-#### Keys ignored in scope 176:.:mimetypes:mimetypes/mimetypes.pri:(CMAKE_BUILD_TYPE STREQUAL Debug):
+#### Keys ignored in scope 175:.:mimetypes:mimetypes/mimetypes.pri:(CMAKE_BUILD_TYPE STREQUAL Debug):
 # outpath = "$$outpath/debug"
 
-#### Keys ignored in scope 177:.:mimetypes:mimetypes/mimetypes.pri:else:
+#### Keys ignored in scope 176:.:mimetypes:mimetypes/mimetypes.pri:else:
 # outpath = "$$outpath/release"
 
-#### Keys ignored in scope 178:.:mimetypes:mimetypes/mimetypes.pri:MAKEFILE_GENERATOR___equals___MSVC.NET OR MAKEFILE_GENERATOR___equals___MSBUILD OR QMAKE_SH_ISEMPTY:
+#### Keys ignored in scope 177:.:mimetypes:mimetypes/mimetypes.pri:MAKEFILE_GENERATOR___equals___MSVC.NET OR MAKEFILE_GENERATOR___equals___MSBUILD OR QMAKE_SH_ISEMPTY:
 # mimedb.commands = "cmd" "/c" "$$shell_path($$PWD/mime/generate.bat)"
 # mimedb.depends = "$$PWD/mime/generate.bat" "$$PWD/mime/hexdump.ps1"
 
-#### Keys ignored in scope 179:.:mimetypes:mimetypes/mimetypes.pri:else:
+#### Keys ignored in scope 178:.:mimetypes:mimetypes/mimetypes.pri:else:
 # mimedb.commands = "perl" "$${mimedb.depends}"
 
-#### Keys ignored in scope 180:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_zstd:
+#### Keys ignored in scope 179:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_zstd:
 # mimedb.commands = "--zstd"
 # Resources:
 # special case begin
diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt
index 7f43e1c510..981a88c603 100644
--- a/src/gui/.prev_CMakeLists.txt
+++ b/src/gui/.prev_CMakeLists.txt
@@ -139,7 +139,6 @@ qt_internal_add_module(Gui
         painting/qpixellayout.cpp painting/qpixellayout_p.h
         painting/qplatformbackingstore.cpp painting/qplatformbackingstore.h
         painting/qpolygon.cpp painting/qpolygon.h
-        painting/qpolygonclipper_p.h
         painting/qrangecollection.cpp painting/qrangecollection.h painting/qrangecollection_p.h
         painting/qrasterdefs_p.h
         painting/qrasterizer.cpp painting/qrasterizer_p.h
diff --git a/src/network/android/jar/.prev_CMakeLists.txt b/src/network/android/jar/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..de5ce376bb
--- /dev/null
+++ b/src/network/android/jar/.prev_CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from jar.pro.
+
+set(java_sources
+    src/org/qtproject/qt/android/network/QtNetwork.java
+)
+
+qt_internal_add_jar(QtAndroidNetwork
+    INCLUDE_JARS ${QT_ANDROID_JAR}
+    SOURCES ${java_sources}
+    OUTPUT_DIR "${QT_BUILD_DIR}/jar"
+)
+
+install_jar(QtAndroidNetwork
+    DESTINATION jar
+    COMPONENT Devel
+)
+
diff --git a/src/platformsupport/fbconvenience/.prev_CMakeLists.txt b/src/platformsupport/fbconvenience/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..c310cb1faa
--- /dev/null
+++ b/src/platformsupport/fbconvenience/.prev_CMakeLists.txt
@@ -0,0 +1,26 @@
+# Generated from fbconvenience.pro.
+
+#####################################################################
+## FbSupport Module:
+#####################################################################
+
+qt_internal_add_module(FbSupport
+    STATIC
+    INTERNAL_MODULE
+    SOURCES
+        qfbbackingstore.cpp qfbbackingstore_p.h
+        qfbcursor.cpp qfbcursor_p.h
+        qfbscreen.cpp qfbscreen_p.h
+        qfbvthandler.cpp qfbvthandler_p.h
+        qfbwindow.cpp qfbwindow_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PRECOMPILED_HEADER
+        "../../corelib/global/qt_pch.h"
+)
+
+#### Keys ignored in scope 1:.:.:fbconvenience.pro:<TRUE>:
+# MODULE = "fb_support"
diff --git a/src/platformsupport/input/.prev_CMakeLists.txt b/src/platformsupport/input/.prev_CMakeLists.txt
index 17d3748ea2..0b7fae078b 100644
--- a/src/platformsupport/input/.prev_CMakeLists.txt
+++ b/src/platformsupport/input/.prev_CMakeLists.txt
@@ -86,7 +86,7 @@ qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_
     SOURCES
         shared/devicehandlerlist_p.h
         shared/qevdevutil.cpp shared/qevdevutil_p.h
-        shared/qtouchoutputmapping.cpp shared/qtouchoutputmapping_p.h
+        shared/qoutputmapping.cpp shared/qoutputmapping_p.h
 )
 
 qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_integrityhid
diff --git a/src/plugins/platforms/direct2d/.prev_CMakeLists.txt b/src/plugins/platforms/direct2d/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..dc260bc0a4
--- /dev/null
+++ b/src/plugins/platforms/direct2d/.prev_CMakeLists.txt
@@ -0,0 +1,278 @@
+# Generated from direct2d.pro.
+
+#####################################################################
+## QWindowsDirect2DIntegrationPlugin Plugin:
+#####################################################################
+
+qt_internal_add_plugin(QWindowsDirect2DIntegrationPlugin
+    OUTPUT_NAME qdirect2d
+    TYPE platforms
+    SOURCES
+        ../windows/qtwindowsglobal.h
+        ../windows/qwin10helpers.cpp ../windows/qwin10helpers.h
+        ../windows/qwindowsapplication.cpp ../windows/qwindowsapplication.h
+        ../windows/qwindowscombase.h
+        ../windows/qwindowscontext.cpp ../windows/qwindowscontext.h
+        ../windows/qwindowscursor.cpp ../windows/qwindowscursor.h
+        ../windows/qwindowsdialoghelpers.cpp ../windows/qwindowsdialoghelpers.h
+        ../windows/qwindowsdropdataobject.cpp ../windows/qwindowsdropdataobject.h
+        ../windows/qwindowsinputcontext.cpp ../windows/qwindowsinputcontext.h
+        ../windows/qwindowsintegration.cpp ../windows/qwindowsintegration.h
+        ../windows/qwindowsinternalmimedata.cpp ../windows/qwindowsinternalmimedata.h
+        ../windows/qwindowskeymapper.cpp ../windows/qwindowskeymapper.h
+        ../windows/qwindowsmenu.cpp ../windows/qwindowsmenu.h
+        ../windows/qwindowsmime.cpp ../windows/qwindowsmime.h
+        ../windows/qwindowsmousehandler.cpp ../windows/qwindowsmousehandler.h
+        ../windows/qwindowsnativeinterface.cpp ../windows/qwindowsnativeinterface.h
+        ../windows/qwindowsole.cpp ../windows/qwindowsole.h
+        ../windows/qwindowsopengltester.cpp ../windows/qwindowsopengltester.h
+        ../windows/qwindowspointerhandler.cpp ../windows/qwindowspointerhandler.h
+        ../windows/qwindowsscreen.cpp ../windows/qwindowsscreen.h
+        ../windows/qwindowsservices.cpp ../windows/qwindowsservices.h
+        ../windows/qwindowstheme.cpp ../windows/qwindowstheme.h
+        ../windows/qwindowsthreadpoolrunner.h
+        ../windows/qwindowswindow.cpp ../windows/qwindowswindow.h
+        qwindowsdirect2dbackingstore.cpp qwindowsdirect2dbackingstore.h
+        qwindowsdirect2dbitmap.cpp qwindowsdirect2dbitmap.h
+        qwindowsdirect2dcontext.cpp qwindowsdirect2dcontext.h
+        qwindowsdirect2ddevicecontext.cpp qwindowsdirect2ddevicecontext.h
+        qwindowsdirect2dhelpers.h
+        qwindowsdirect2dintegration.cpp qwindowsdirect2dintegration.h
+        qwindowsdirect2dnativeinterface.cpp qwindowsdirect2dnativeinterface.h
+        qwindowsdirect2dpaintdevice.cpp qwindowsdirect2dpaintdevice.h
+        qwindowsdirect2dpaintengine.cpp qwindowsdirect2dpaintengine.h
+        qwindowsdirect2dplatformpixmap.cpp qwindowsdirect2dplatformpixmap.h
+        qwindowsdirect2dplatformplugin.cpp
+        qwindowsdirect2dwindow.cpp qwindowsdirect2dwindow.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_FOREACH
+    INCLUDE_DIRECTORIES
+        ../windows
+    LIBRARIES
+        advapi32
+        d2d1_1
+        dwrite_2
+        gdi32
+        ole32
+        shell32
+        user32
+        winmm
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        d3d11
+        dwmapi
+        dxgi
+        dxguid
+        imm32
+        oleaut32
+        shlwapi
+        version
+        winspool
+        wtsapi32
+)
+
+# Resources:
+set_source_files_properties("../windows/openglblacklists/default.json"
+    PROPERTIES QT_RESOURCE_ALIAS "default.json"
+)
+set(openglblacklists_resource_files
+    "openglblacklists/default.json"
+)
+
+qt_internal_add_resource(QWindowsDirect2DIntegrationPlugin "openglblacklists"
+    PREFIX
+        "/qt-project.org/windows/openglblacklists"
+    BASE
+        "../windows"
+    FILES
+        ${openglblacklists_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:direct2d.pro:<TRUE>:
+# OTHER_FILES = "direct2d.json"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:direct2d.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
+
+qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl
+    PUBLIC_LIBRARIES
+        opengl32
+)
+
+qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION MINGW
+    PUBLIC_LIBRARIES
+        uuid
+)
+
+qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION QT_FEATURE_opengl
+    SOURCES
+        ../windows/qwindowsglcontext.cpp ../windows/qwindowsglcontext.h
+        ../windows/qwindowsopenglcontext.h
+)
+
+qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION QT_FEATURE_systemtrayicon
+    SOURCES
+        ../windows/qwindowssystemtrayicon.cpp ../windows/qwindowssystemtrayicon.h
+)
+
+qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION QT_FEATURE_vulkan
+    SOURCES
+        ../windows/qwindowsvulkaninstance.cpp ../windows/qwindowsvulkaninstance.h
+)
+
+qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION QT_FEATURE_clipboard
+    SOURCES
+        ../windows/qwindowsclipboard.cpp ../windows/qwindowsclipboard.h
+)
+
+qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop
+    SOURCES
+        ../windows/qwindowsdrag.cpp ../windows/qwindowsdrag.h
+)
+
+qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION QT_FEATURE_tabletevent
+    SOURCES
+        ../windows/qwindowstabletsupport.cpp ../windows/qwindowstabletsupport.h
+    INCLUDE_DIRECTORIES
+        ${QT_SOURCE_TREE}/src/3rdparty/wintab
+)
+
+qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION QT_FEATURE_sessionmanager
+    SOURCES
+        ../windows/qwindowssessionmanager.cpp ../windows/qwindowssessionmanager.h
+)
+
+if(QT_FEATURE_imageformat_png)
+    # Resources:
+    set_source_files_properties("../windows/images/closedhandcursor_32.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/closedhandcursor_32.png"
+    )
+    set_source_files_properties("../windows/images/closedhandcursor_48.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/closedhandcursor_48.png"
+    )
+    set_source_files_properties("../windows/images/closedhandcursor_64.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/closedhandcursor_64.png"
+    )
+    set_source_files_properties("../windows/images/dragcopycursor_32.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/dragcopycursor_32.png"
+    )
+    set_source_files_properties("../windows/images/dragcopycursor_48.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/dragcopycursor_48.png"
+    )
+    set_source_files_properties("../windows/images/dragcopycursor_64.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/dragcopycursor_64.png"
+    )
+    set_source_files_properties("../windows/images/draglinkcursor_32.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/draglinkcursor_32.png"
+    )
+    set_source_files_properties("../windows/images/draglinkcursor_48.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/draglinkcursor_48.png"
+    )
+    set_source_files_properties("../windows/images/draglinkcursor_64.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/draglinkcursor_64.png"
+    )
+    set_source_files_properties("../windows/images/dragmovecursor_32.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/dragmovecursor_32.png"
+    )
+    set_source_files_properties("../windows/images/dragmovecursor_48.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/dragmovecursor_48.png"
+    )
+    set_source_files_properties("../windows/images/dragmovecursor_64.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/dragmovecursor_64.png"
+    )
+    set_source_files_properties("../windows/images/openhandcursor_32.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/openhandcursor_32.png"
+    )
+    set_source_files_properties("../windows/images/openhandcursor_48.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/openhandcursor_48.png"
+    )
+    set_source_files_properties("../windows/images/openhandcursor_64.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/openhandcursor_64.png"
+    )
+    set_source_files_properties("../windows/images/splithcursor_32.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/splithcursor_32.png"
+    )
+    set_source_files_properties("../windows/images/splithcursor_48.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/splithcursor_48.png"
+    )
+    set_source_files_properties("../windows/images/splithcursor_64.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/splithcursor_64.png"
+    )
+    set_source_files_properties("../windows/images/splitvcursor_32.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/splitvcursor_32.png"
+    )
+    set_source_files_properties("../windows/images/splitvcursor_48.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/splitvcursor_48.png"
+    )
+    set_source_files_properties("../windows/images/splitvcursor_64.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/splitvcursor_64.png"
+    )
+    set(cursors_resource_files
+        "images/closedhandcursor_32.png"
+        "images/closedhandcursor_48.png"
+        "images/closedhandcursor_64.png"
+        "images/dragcopycursor_32.png"
+        "images/dragcopycursor_48.png"
+        "images/dragcopycursor_64.png"
+        "images/draglinkcursor_32.png"
+        "images/draglinkcursor_48.png"
+        "images/draglinkcursor_64.png"
+        "images/dragmovecursor_32.png"
+        "images/dragmovecursor_48.png"
+        "images/dragmovecursor_64.png"
+        "images/openhandcursor_32.png"
+        "images/openhandcursor_48.png"
+        "images/openhandcursor_64.png"
+        "images/splithcursor_32.png"
+        "images/splithcursor_48.png"
+        "images/splithcursor_64.png"
+        "images/splitvcursor_32.png"
+        "images/splitvcursor_48.png"
+        "images/splitvcursor_64.png"
+    )
+
+    qt_internal_add_resource(QWindowsDirect2DIntegrationPlugin "cursors"
+        PREFIX
+            "/qt-project.org/windows/cursors"
+        BASE
+            "../windows"
+        FILES
+            ${cursors_resource_files}
+    )
+endif()
+
+qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION QT_FEATURE_accessibility
+    SOURCES
+        ../windows/uiautomation/qwindowsuiaaccessibility.cpp ../windows/uiautomation/qwindowsuiaaccessibility.h
+        ../windows/uiautomation/qwindowsuiabaseprovider.cpp ../windows/uiautomation/qwindowsuiabaseprovider.h
+        ../windows/uiautomation/qwindowsuiaexpandcollapseprovider.cpp ../windows/uiautomation/qwindowsuiaexpandcollapseprovider.h
+        ../windows/uiautomation/qwindowsuiagriditemprovider.cpp ../windows/uiautomation/qwindowsuiagriditemprovider.h
+        ../windows/uiautomation/qwindowsuiagridprovider.cpp ../windows/uiautomation/qwindowsuiagridprovider.h
+        ../windows/uiautomation/qwindowsuiainvokeprovider.cpp ../windows/uiautomation/qwindowsuiainvokeprovider.h
+        ../windows/uiautomation/qwindowsuiamainprovider.cpp ../windows/uiautomation/qwindowsuiamainprovider.h
+        ../windows/uiautomation/qwindowsuiaprovidercache.cpp ../windows/uiautomation/qwindowsuiaprovidercache.h
+        ../windows/uiautomation/qwindowsuiarangevalueprovider.cpp ../windows/uiautomation/qwindowsuiarangevalueprovider.h
+        ../windows/uiautomation/qwindowsuiaselectionitemprovider.cpp ../windows/uiautomation/qwindowsuiaselectionitemprovider.h
+        ../windows/uiautomation/qwindowsuiaselectionprovider.cpp ../windows/uiautomation/qwindowsuiaselectionprovider.h
+        ../windows/uiautomation/qwindowsuiatableitemprovider.cpp ../windows/uiautomation/qwindowsuiatableitemprovider.h
+        ../windows/uiautomation/qwindowsuiatableprovider.cpp ../windows/uiautomation/qwindowsuiatableprovider.h
+        ../windows/uiautomation/qwindowsuiatextprovider.cpp ../windows/uiautomation/qwindowsuiatextprovider.h
+        ../windows/uiautomation/qwindowsuiatextrangeprovider.cpp ../windows/uiautomation/qwindowsuiatextrangeprovider.h
+        ../windows/uiautomation/qwindowsuiatoggleprovider.cpp ../windows/uiautomation/qwindowsuiatoggleprovider.h
+        ../windows/uiautomation/qwindowsuiautils.cpp ../windows/uiautomation/qwindowsuiautils.h
+        ../windows/uiautomation/qwindowsuiavalueprovider.cpp ../windows/uiautomation/qwindowsuiavalueprovider.h
+        ../windows/uiautomation/qwindowsuiawindowprovider.cpp ../windows/uiautomation/qwindowsuiawindowprovider.h
+)
+
+qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility
+    PUBLIC_LIBRARIES
+        uuid
+)
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
index a790a01c62..179ee5b766 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
@@ -19,16 +19,13 @@ qt_internal_add_module(EglFsKmsGbmSupport
         ../eglfs_kms_support
     PUBLIC_LIBRARIES
         Libdrm::Libdrm
-        Qt::Core
         Qt::CorePrivate
         Qt::EglFSDeviceIntegrationPrivate
         Qt::EglFsKmsSupportPrivate
-        Qt::Gui
         Qt::GuiPrivate
         Qt::KmsSupportPrivate
         gbm::gbm
 )
-
 #####################################################################
 ## QEglFSKmsGbmIntegrationPlugin Plugin:
 #####################################################################
@@ -42,16 +39,14 @@ qt_internal_add_plugin(QEglFSKmsGbmIntegrationPlugin
         QT_EGL_NO_X11
     PUBLIC_LIBRARIES
         Libdrm::Libdrm
-        Qt::Core
         Qt::CorePrivate
         Qt::EglFSDeviceIntegrationPrivate
         Qt::EglFsKmsGbmSupportPrivate
         Qt::EglFsKmsSupportPrivate
-        Qt::Gui
         Qt::GuiPrivate
         Qt::KmsSupportPrivate
         gbm::gbm
 )
 
-#### Keys ignored in scope 1:.:.:eglfs_kms-plugin.pro:<TRUE>:
+#### Keys ignored in scope 3:.:.:eglfs_kms-plugin.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/eglfs_kms.json"
diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/.prev_CMakeLists.txt b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..526a053b02
--- /dev/null
+++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/.prev_CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from nsphotolibrarysupport.pro.
+
+#####################################################################
+## QIosOptionalPlugin_NSPhotoLibrary Plugin:
+#####################################################################
+
+qt_internal_add_plugin(QIosOptionalPlugin_NSPhotoLibrary
+    OUTPUT_NAME qiosnsphotolibrarysupport
+    TYPE platforms/darwin
+    SOURCES
+        plugin.mm
+        qiosfileengineassetslibrary.h qiosfileengineassetslibrary.mm
+        qiosfileenginefactory.h
+        qiosimagepickercontroller.h qiosimagepickercontroller.mm
+    PUBLIC_LIBRARIES
+        ${FWAssetsLibrary}
+        ${FWFoundation}
+        ${FWUIKit}
+        Qt::Core
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:nsphotolibrarysupport.pro:<TRUE>:
+# OTHER_FILES = "plugin.json"
+# PLUGIN_EXTENDS = "-"
+
+## Scopes:
+#####################################################################
diff --git a/src/plugins/platforms/xcb/.prev_CMakeLists.txt b/src/plugins/platforms/xcb/.prev_CMakeLists.txt
index 58f635c081..949cfc5186 100644
--- a/src/plugins/platforms/xcb/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/xcb/.prev_CMakeLists.txt
@@ -110,6 +110,7 @@ qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting
         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/qpolygonclipper_p.h
         nativepainting/qt_x11_p.h
         nativepainting/qtessellator.cpp nativepainting/qtessellator_p.h
         nativepainting/qxcbnativepainting.cpp nativepainting/qxcbnativepainting.h
diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt
index e4af25458e..0a48238b47 100644
--- a/src/plugins/platforms/xcb/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/CMakeLists.txt
@@ -120,7 +120,7 @@ qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting
         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/polygonclipper_p.h
+        nativepainting/qpolygonclipper_p.h
         nativepainting/qt_x11_p.h
         nativepainting/qtessellator.cpp nativepainting/qtessellator_p.h
         nativepainting/qxcbnativepainting.cpp nativepainting/qxcbnativepainting.h
diff --git a/src/widgets/.prev_CMakeLists.txt b/src/widgets/.prev_CMakeLists.txt
index b2914b7007..fac6de791c 100644
--- a/src/widgets/.prev_CMakeLists.txt
+++ b/src/widgets/.prev_CMakeLists.txt
@@ -319,8 +319,9 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_graphicseffect
 
 qt_internal_extend_target(Widgets CONDITION QT_FEATURE_action
     SOURCES
-        kernel/qaction.h kernel/qactiongroup.h
+        kernel/qaction.h
         kernel/qaction_widgets.cpp kernel/qaction_widgets_p.h
+        kernel/qactiongroup.h
         kernel/qwidgetaction.cpp kernel/qwidgetaction.h kernel/qwidgetaction_p.h
 )
 
@@ -331,7 +332,8 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_formlayout
 
 qt_internal_extend_target(Widgets CONDITION QT_FEATURE_shortcut
     SOURCES
-        kernel/qshortcut.h kernel/qshortcut_widgets.cpp
+        kernel/qshortcut.h
+        kernel/qshortcut_widgets.cpp
 )
 
 qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tooltip
@@ -787,12 +789,12 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_scroller
         util/qscrollerproperties.cpp util/qscrollerproperties.h util/qscrollerproperties_p.h
 )
 
-qt_internal_extend_target(Gui CONDITION QT_FEATURE_undocommand
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_undocommand
     SOURCES
         util/qundostack.h
 )
 
-qt_internal_extend_target(Gui CONDITION QT_FEATURE_undogroup
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_undogroup
     SOURCES
         util/qundogroup.h
 )
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index afc1aa6753..83548698db 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -321,8 +321,9 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_graphicseffect
 
 qt_internal_extend_target(Widgets CONDITION QT_FEATURE_action
     SOURCES
-        kernel/qaction.h kernel/qactiongroup.h
+        kernel/qaction.h
         kernel/qaction_widgets.cpp kernel/qaction_widgets_p.h
+        kernel/qactiongroup.h
         kernel/qwidgetaction.cpp kernel/qwidgetaction.h kernel/qwidgetaction_p.h
 )
 
@@ -333,7 +334,8 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_formlayout
 
 qt_internal_extend_target(Widgets CONDITION QT_FEATURE_shortcut
     SOURCES
-        kernel/qshortcut.h kernel/qshortcut_widgets.cpp
+        kernel/qshortcut.h
+        kernel/qshortcut_widgets.cpp
 )
 
 qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tooltip
@@ -789,12 +791,12 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_scroller
         util/qscrollerproperties.cpp util/qscrollerproperties.h util/qscrollerproperties_p.h
 )
 
-qt_internal_extend_target(Gui CONDITION QT_FEATURE_undocommand
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_undocommand
     SOURCES
         util/qundostack.h
 )
 
-qt_internal_extend_target(Gui CONDITION QT_FEATURE_undogroup
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_undogroup
     SOURCES
         util/qundogroup.h
 )