Regenerate plugin projects to get new target names

And also to get the original output names (qmake's "TARGET"), so that
the plugin file names are as they were in Qt 5.

Change-Id: I96a060d1a81693652847857372bec334728cb549
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

25 files changed, 160 insertions, 160 deletions

diff --git a/src/plugins/platforms/android/.prev_CMakeLists.txt b/src/plugins/platforms/android/.prev_CMakeLists.txt
index 62d66746d8..047abff880 100644
--- a/src/plugins/platforms/android/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/android/.prev_CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from android.pro.
 
 #####################################################################
-## qtforandroid Plugin:
+## QAndroidIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qtforandroid
+qt_add_plugin(QAndroidIntegrationPlugin
+    OUTPUT_NAME qtforandroid
     TYPE platforms
-    CLASS_NAME QAndroidIntegrationPlugin
     SOURCES
         androidcontentfileengine.cpp androidcontentfileengine.h
         androiddeadlockprotector.cpp androiddeadlockprotector.h
@@ -66,7 +66,7 @@ qt_add_plugin(qtforandroid
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qtforandroid CONDITION QT_FEATURE_vulkan
+qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan
     SOURCES
         qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h
         qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h
@@ -76,12 +76,12 @@ qt_extend_target(qtforandroid CONDITION QT_FEATURE_vulkan
         Qt::VulkanSupport
 )
 
-qt_extend_target(qtforandroid CONDITION QT_FEATURE_android_style_assets
+qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets
     SOURCES
         extract.cpp
 )
 
-qt_extend_target(qtforandroid CONDITION NOT QT_FEATURE_android_style_assets
+qt_extend_target(QAndroidIntegrationPlugin CONDITION NOT QT_FEATURE_android_style_assets
     SOURCES
         extract-dummy.cpp
 )
diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt
index 406cb54d72..d66fb239d7 100644
--- a/src/plugins/platforms/android/CMakeLists.txt
+++ b/src/plugins/platforms/android/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from android.pro.
 
 #####################################################################
-## qtforandroid Plugin:
+## QAndroidIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qtforandroid
+qt_add_plugin(QAndroidIntegrationPlugin
+    OUTPUT_NAME qtforandroid
     TYPE platforms
-    CLASS_NAME QAndroidIntegrationPlugin
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES android # special case
     SOURCES
         androidcontentfileengine.cpp androidcontentfileengine.h
@@ -75,7 +75,7 @@ qt_add_plugin(qtforandroid
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qtforandroid CONDITION QT_FEATURE_vulkan
+qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan
     SOURCES
         qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h
         qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h
@@ -85,12 +85,12 @@ qt_extend_target(qtforandroid CONDITION QT_FEATURE_vulkan
         Qt::VulkanSupport
 )
 
-qt_extend_target(qtforandroid CONDITION QT_FEATURE_android_style_assets
+qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets
     SOURCES
         extract.cpp
 )
 
-qt_extend_target(qtforandroid CONDITION NOT QT_FEATURE_android_style_assets
+qt_extend_target(QAndroidIntegrationPlugin CONDITION NOT QT_FEATURE_android_style_assets
     SOURCES
         extract-dummy.cpp
 )
diff --git a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt
index 27fe778f95..d557a510d7 100644
--- a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from cocoa.pro.
 
 #####################################################################
-## qcocoa Plugin:
+## QCocoaIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qcocoa
+qt_add_plugin(QCocoaIntegrationPlugin
+    OUTPUT_NAME qcocoa
     TYPE platforms
-    CLASS_NAME QCocoaIntegrationPlugin
     SOURCES
         main.mm
         messages.cpp messages.h
@@ -73,7 +73,7 @@ set(qcocoaresources_resource_files
     "images/waitcursor.png"
 )
 
-qt_add_resource(qcocoa "qcocoaresources"
+qt_add_resource(QCocoaIntegrationPlugin "qcocoaresources"
     PREFIX
         "/qt-project.org/mac/cursors"
     FILES
@@ -87,12 +87,12 @@ qt_add_resource(qcocoa "qcocoaresources"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qcocoa CONDITION QT_FEATURE_opengl
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl
     SOURCES
         qcocoaglcontext.h qcocoaglcontext.mm
 )
 
-qt_extend_target(qcocoa CONDITION QT_FEATURE_vulkan
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_vulkan
     SOURCES
         qcocoavulkaninstance.h qcocoavulkaninstance.mm
     LIBRARIES
@@ -101,7 +101,7 @@ qt_extend_target(qcocoa CONDITION QT_FEATURE_vulkan
         Qt::VulkanSupport
 )
 
-qt_extend_target(qcocoa CONDITION QT_FEATURE_accessibility
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_accessibility
     SOURCES
         qcocoaaccessibility.h qcocoaaccessibility.mm
         qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm
@@ -111,12 +111,12 @@ qt_extend_target(qcocoa CONDITION QT_FEATURE_accessibility
         Qt::AccessibilitySupport
 )
 
-qt_extend_target(qcocoa CONDITION QT_FEATURE_sessionmanager
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager
     SOURCES
         qcocoasessionmanager.cpp qcocoasessionmanager.h
 )
 
-qt_extend_target(qcocoa CONDITION TARGET Qt::Widgets
+qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::Widgets
     SOURCES
         qpaintengine_mac.mm qpaintengine_mac_p.h
     LIBRARIES
@@ -128,7 +128,7 @@ qt_extend_target(qcocoa CONDITION TARGET Qt::Widgets
 #### Keys ignored in scope 7:.:.:cocoa.pro:TARGET Qt::Widgets:
 # QT_FOR_CONFIG = "widgets"
 
-qt_extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets
+qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets
     SOURCES
         qcocoaprintdevice.h qcocoaprintdevice.mm
         qcocoaprintersupport.h qcocoaprintersupport.mm
@@ -139,17 +139,17 @@ qt_extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets
         Qt::PrintSupport
 )
 
-qt_extend_target(qcocoa CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets
     SOURCES
         qcocoacolordialoghelper.h qcocoacolordialoghelper.mm
 )
 
-qt_extend_target(qcocoa CONDITION QT_FEATURE_filedialog AND TARGET Qt::Widgets
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_filedialog AND TARGET Qt::Widgets
     SOURCES
         qcocoafiledialoghelper.h qcocoafiledialoghelper.mm
 )
 
-qt_extend_target(qcocoa CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets
     SOURCES
         qcocoafontdialoghelper.h qcocoafontdialoghelper.mm
 )
diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt
index dbaea562a8..7ed2a8ffdb 100644
--- a/src/plugins/platforms/cocoa/CMakeLists.txt
+++ b/src/plugins/platforms/cocoa/CMakeLists.txt
@@ -4,13 +4,13 @@
 qt_find_package(Cups PROVIDED_TARGETS Cups::Cups)
 
 #####################################################################
-## qcocoa Plugin:
+## QCocoaIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qcocoa
-    TYPE platforms
+qt_add_plugin(QCocoaIntegrationPlugin
+    OUTPUT_NAME qcocoa
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES cocoa # special case
-    CLASS_NAME QCocoaIntegrationPlugin
+    TYPE platforms
     SOURCES
         main.mm
         messages.cpp messages.h
@@ -77,7 +77,7 @@ set(qcocoaresources_resource_files
     "images/waitcursor.png"
 )
 
-qt_add_resource(qcocoa "qcocoaresources"
+qt_add_resource(QCocoaIntegrationPlugin "qcocoaresources"
     PREFIX
         "/qt-project.org/mac/cursors"
     FILES
@@ -91,12 +91,12 @@ qt_add_resource(qcocoa "qcocoaresources"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qcocoa CONDITION QT_FEATURE_opengl
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl
     SOURCES
         qcocoaglcontext.h qcocoaglcontext.mm
 )
 
-qt_extend_target(qcocoa CONDITION QT_FEATURE_vulkan
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_vulkan
     SOURCES
         qcocoavulkaninstance.h qcocoavulkaninstance.mm
     LIBRARIES
@@ -105,7 +105,7 @@ qt_extend_target(qcocoa CONDITION QT_FEATURE_vulkan
         Qt::VulkanSupport
 )
 
-qt_extend_target(qcocoa CONDITION QT_FEATURE_accessibility
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_accessibility
     SOURCES
         qcocoaaccessibility.h qcocoaaccessibility.mm
         qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm
@@ -115,12 +115,12 @@ qt_extend_target(qcocoa CONDITION QT_FEATURE_accessibility
         Qt::AccessibilitySupport
 )
 
-qt_extend_target(qcocoa CONDITION QT_FEATURE_sessionmanager
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager
     SOURCES
         qcocoasessionmanager.cpp qcocoasessionmanager.h
 )
 
-qt_extend_target(qcocoa CONDITION TARGET Qt::Widgets
+qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::Widgets
     SOURCES
         qpaintengine_mac.mm qpaintengine_mac_p.h
     LIBRARIES
@@ -132,7 +132,7 @@ qt_extend_target(qcocoa CONDITION TARGET Qt::Widgets
 #### Keys ignored in scope 7:.:.:cocoa.pro:TARGET Qt::Widgets:
 # QT_FOR_CONFIG = "widgets"
 
-qt_extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets
+qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets
     SOURCES
         qcocoaprintdevice.h qcocoaprintdevice.mm
         qcocoaprintersupport.h qcocoaprintersupport.mm
@@ -143,17 +143,17 @@ qt_extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets
         Qt::PrintSupport
 )
 
-qt_extend_target(qcocoa CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets
     SOURCES
         qcocoacolordialoghelper.h qcocoacolordialoghelper.mm
 )
 
-qt_extend_target(qcocoa CONDITION QT_FEATURE_filedialog AND TARGET Qt::Widgets
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_filedialog AND TARGET Qt::Widgets
     SOURCES
         qcocoafiledialoghelper.h qcocoafiledialoghelper.mm
 )
 
-qt_extend_target(qcocoa CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets
     SOURCES
         qcocoafontdialoghelper.h qcocoafontdialoghelper.mm
 )
diff --git a/src/plugins/platforms/directfb/.prev_CMakeLists.txt b/src/plugins/platforms/directfb/.prev_CMakeLists.txt
index 3bfdb81666..b16e7cb9bd 100644
--- a/src/plugins/platforms/directfb/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/directfb/.prev_CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from directfb.pro.
 
 #####################################################################
-## qdirectfb Plugin:
+## QDirectFbIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qdirectfb
+qt_add_plugin(QDirectFbIntegrationPlugin
+    OUTPUT_NAME qdirectfb
     TYPE platforms
-    CLASS_NAME QDirectFbIntegrationPlugin
     SOURCES
         main.cpp
         qdirectfbbackingstore.cpp qdirectfbbackingstore.h
@@ -39,7 +39,7 @@ qt_add_plugin(qdirectfb
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qdirectfb CONDITION QT_CONFIG___contains___directfb_egl
+qt_extend_target(QDirectFbIntegrationPlugin CONDITION QT_CONFIG___contains___directfb_egl
     SOURCES
         qdirectfb_egl.cpp qdirectfb_egl.h
     DEFINES
@@ -50,7 +50,7 @@ qt_extend_target(qdirectfb CONDITION QT_CONFIG___contains___directfb_egl
         Qt::EglSupport
 )
 
-qt_extend_target(qdirectfb CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY
+qt_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY
     DEFINES
         DIRECTFB_PLATFORM_HOOKS
 )
@@ -58,7 +58,7 @@ qt_extend_target(qdirectfb CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY
 #### Keys ignored in scope 3:.:.:directfb.pro:NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY:
 # QMAKE_LIBDIR = "$$DIRECTFB_PLATFORM_HOOKS_LIBDIR"
 
-qt_extend_target(qdirectfb CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY
+qt_extend_target(QDirectFbIntegrationPlugin CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY
     SOURCES
         qdirectfbeglhooks_stub.cpp
 )
diff --git a/src/plugins/platforms/directfb/CMakeLists.txt b/src/plugins/platforms/directfb/CMakeLists.txt
index 5629e79385..b696943257 100644
--- a/src/plugins/platforms/directfb/CMakeLists.txt
+++ b/src/plugins/platforms/directfb/CMakeLists.txt
@@ -5,12 +5,12 @@ qt_find_package(DirectFB)
 # end special case:
 
 #####################################################################
-## qdirectfb Plugin:
+## QDirectFbIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qdirectfb
+qt_add_plugin(QDirectFbIntegrationPlugin
+    OUTPUT_NAME qdirectfb
     TYPE platforms
-    CLASS_NAME QDirectFbIntegrationPlugin
     SOURCES
         main.cpp
         qdirectfbbackingstore.cpp qdirectfbbackingstore.h
@@ -43,7 +43,7 @@ qt_add_plugin(qdirectfb
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qdirectfb CONDITION QT_CONFIG___contains___directfb_egl
+qt_extend_target(QDirectFbIntegrationPlugin CONDITION QT_CONFIG___contains___directfb_egl
     SOURCES
         qdirectfb_egl.cpp qdirectfb_egl.h
     DEFINES
@@ -54,7 +54,7 @@ qt_extend_target(qdirectfb CONDITION QT_CONFIG___contains___directfb_egl
         Qt::EglSupport
 )
 
-qt_extend_target(qdirectfb CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY
+qt_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY
     DEFINES
         DIRECTFB_PLATFORM_HOOKS
 )
@@ -62,7 +62,7 @@ qt_extend_target(qdirectfb CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY
 #### Keys ignored in scope 3:.:.:directfb.pro:NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY:
 # QMAKE_LIBDIR = "$$DIRECTFB_PLATFORM_HOOKS_LIBDIR"
 
-qt_extend_target(qdirectfb CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY
+qt_extend_target(QDirectFbIntegrationPlugin CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY
     SOURCES
         qdirectfbeglhooks_stub.cpp
 )
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt
index 320ef4f1d8..fa6623ee50 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from eglfs_emu.pro.
 
 #####################################################################
-## qeglfs-emu-integration Plugin:
+## QEglFSEmulatorIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qeglfs-emu-integration
+qt_add_plugin(QEglFSEmulatorIntegrationPlugin
+    OUTPUT_NAME qeglfs-emu-integration
     TYPE egldeviceintegrations
-    CLASS_NAME QEglFSEmulatorIntegrationPlugin
     SOURCES
         qeglfsemulatorintegration.cpp qeglfsemulatorintegration.h
         qeglfsemulatorscreen.cpp qeglfsemulatorscreen.h
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
index 656190e7a8..d2a2b9699d 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from eglfs_kms.pro.
 
 #####################################################################
-## qeglfs-kms-integration Plugin:
+## QEglFSKmsGbmIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qeglfs-kms-integration
+qt_add_plugin(QEglFSKmsGbmIntegrationPlugin
+    OUTPUT_NAME qeglfs-kms-integration
     TYPE egldeviceintegrations
-    CLASS_NAME QEglFSKmsGbmIntegrationPlugin
     SOURCES
         qeglfskmsgbmcursor.cpp qeglfskmsgbmcursor.h
         qeglfskmsgbmdevice.cpp qeglfskmsgbmdevice.h
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
index 03a2de61eb..63335ced92 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from eglfs_kms_egldevice.pro.
 
 #####################################################################
-## qeglfs-kms-egldevice-integration Plugin:
+## QEglFSKmsEglDeviceIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qeglfs-kms-egldevice-integration
+qt_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin
+    OUTPUT_NAME qeglfs-kms-egldevice-integration
     TYPE egldeviceintegrations
-    CLASS_NAME QEglFSKmsEglDeviceIntegrationPlugin
     SOURCES
         qeglfskmsegldevice.cpp qeglfskmsegldevice.h
         qeglfskmsegldeviceintegration.cpp qeglfskmsegldeviceintegration.h
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt
index fc0bb6847f..cad49366c8 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from eglfs_x11.pro.
 
 #####################################################################
-## qeglfs-x11-integration Plugin:
+## QEglFSX11IntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qeglfs-x11-integration
+qt_add_plugin(QEglFSX11IntegrationPlugin
+    OUTPUT_NAME qeglfs-x11-integration
     TYPE egldeviceintegrations
-    CLASS_NAME QEglFSX11IntegrationPlugin
     SOURCES
         qeglfsx11integration.cpp qeglfsx11integration.h
         qeglfsx11main.cpp
diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt
index 5adac3cabb..0f9128c6f7 100644
--- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt
+++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from nsphotolibrarysupport.pro.
 
 #####################################################################
-## qiosnsphotolibrarysupport Plugin:
+## QIosOptionalPlugin_NSPhotoLibrary Plugin:
 #####################################################################
 
-add_qt_plugin(qiosnsphotolibrarysupport
+add_qt_plugin(QIosOptionalPlugin_NSPhotoLibrary
+    OUTPUT_NAME qiosnsphotolibrarysupport
     TYPE platforms/darwin
-    CLASS_NAME QIosOptionalPlugin_NSPhotoLibrary
     SOURCES
         plugin.mm
         qiosfileengineassetslibrary.h qiosfileengineassetslibrary.mm
diff --git a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt
index 76ec42f0ec..0586e393ec 100644
--- a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from linuxfb.pro.
 
 #####################################################################
-## qlinuxfb Plugin:
+## QLinuxFbIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qlinuxfb
+qt_add_plugin(QLinuxFbIntegrationPlugin
+    OUTPUT_NAME qlinuxfb
     TYPE platforms
-    CLASS_NAME QLinuxFbIntegrationPlugin
     SOURCES
         main.cpp
         qlinuxfbintegration.cpp qlinuxfbintegration.h
@@ -35,14 +35,14 @@ qt_add_plugin(qlinuxfb
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qlinuxfb CONDITION TARGET Qt::InputSupportPrivate
+qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate
     LIBRARIES
         Qt::InputSupportPrivate
     PUBLIC_LIBRARIES
         Qt::InputSupport
 )
 
-qt_extend_target(qlinuxfb CONDITION TARGET Qt::KmsSupportPrivate
+qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::KmsSupportPrivate
     SOURCES
         qlinuxfbdrmscreen.cpp qlinuxfbdrmscreen.h
     LIBRARIES
diff --git a/src/plugins/platforms/linuxfb/CMakeLists.txt b/src/plugins/platforms/linuxfb/CMakeLists.txt
index ac2c216130..b54d4e2c6f 100644
--- a/src/plugins/platforms/linuxfb/CMakeLists.txt
+++ b/src/plugins/platforms/linuxfb/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from linuxfb.pro.
 
 #####################################################################
-## qlinuxfb Plugin:
+## QLinuxFbIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qlinuxfb
+qt_add_plugin(QLinuxFbIntegrationPlugin
+    OUTPUT_NAME qlinuxfb
     TYPE platforms
-    CLASS_NAME QLinuxFbIntegrationPlugin
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES linuxfb # special case
     SOURCES
         main.cpp
@@ -36,14 +36,14 @@ qt_add_plugin(qlinuxfb
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qlinuxfb CONDITION TARGET Qt::InputSupportPrivate
+qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate
     LIBRARIES
         Qt::InputSupportPrivate
     PUBLIC_LIBRARIES
         Qt::InputSupport
 )
 
-qt_extend_target(qlinuxfb CONDITION TARGET Qt::KmsSupportPrivate
+qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::KmsSupportPrivate
     SOURCES
         qlinuxfbdrmscreen.cpp qlinuxfbdrmscreen.h
     LIBRARIES
diff --git a/src/plugins/platforms/minimal/.prev_CMakeLists.txt b/src/plugins/platforms/minimal/.prev_CMakeLists.txt
index 3ceb3e9ef1..e8fb16fdb0 100644
--- a/src/plugins/platforms/minimal/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/minimal/.prev_CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from minimal.pro.
 
 #####################################################################
-## qminimal Plugin:
+## QMinimalIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qminimal
+qt_add_plugin(QMinimalIntegrationPlugin
+    OUTPUT_NAME qminimal
     TYPE platforms
-    CLASS_NAME QMinimalIntegrationPlugin
     SOURCES
         main.cpp
         qminimalbackingstore.cpp qminimalbackingstore.h
@@ -31,7 +31,7 @@ qt_add_plugin(qminimal
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qminimal CONDITION QT_FEATURE_freetype
+qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype
     LIBRARIES
         WrapFreetype::WrapFreetype
 )
diff --git a/src/plugins/platforms/minimal/CMakeLists.txt b/src/plugins/platforms/minimal/CMakeLists.txt
index 5a6307889b..acc097c4c8 100644
--- a/src/plugins/platforms/minimal/CMakeLists.txt
+++ b/src/plugins/platforms/minimal/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from minimal.pro.
 
 #####################################################################
-## qminimal Plugin:
+## QMinimalIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qminimal
+qt_add_plugin(QMinimalIntegrationPlugin
+    OUTPUT_NAME qminimal
     TYPE platforms
-    CLASS_NAME QMinimalIntegrationPlugin
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES minimal # special case
     SOURCES
         main.cpp
@@ -32,7 +32,7 @@ qt_add_plugin(qminimal
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qminimal CONDITION QT_FEATURE_freetype
+qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype
     LIBRARIES
         WrapFreetype::WrapFreetype
 )
diff --git a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt
index ab797ea67d..c7bf3f7c7c 100644
--- a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from minimalegl.pro.
 
 #####################################################################
-## qminimalegl Plugin:
+## QMinimalEglIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qminimalegl
+qt_add_plugin(QMinimalEglIntegrationPlugin
+    OUTPUT_NAME qminimalegl
     TYPE platforms
-    CLASS_NAME QMinimalEglIntegrationPlugin
     SOURCES
         main.cpp
         qminimaleglintegration.cpp qminimaleglintegration.h
@@ -34,7 +34,7 @@ qt_add_plugin(qminimalegl
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qminimalegl CONDITION QT_FEATURE_opengl
+qt_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_opengl
     SOURCES
         qminimaleglbackingstore.cpp qminimaleglbackingstore.h
 )
diff --git a/src/plugins/platforms/minimalegl/CMakeLists.txt b/src/plugins/platforms/minimalegl/CMakeLists.txt
index 0d925fed68..7c549a416b 100644
--- a/src/plugins/platforms/minimalegl/CMakeLists.txt
+++ b/src/plugins/platforms/minimalegl/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from minimalegl.pro.
 
 #####################################################################
-## qminimalegl Plugin:
+## QMinimalEglIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qminimalegl
+qt_add_plugin(QMinimalEglIntegrationPlugin
+    OUTPUT_NAME qminimalegl
     TYPE platforms
-    CLASS_NAME QMinimalEglIntegrationPlugin
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES minimalegl # special case
     SOURCES
         main.cpp
@@ -35,7 +35,7 @@ qt_add_plugin(qminimalegl
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qminimalegl CONDITION QT_FEATURE_opengl
+qt_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_opengl
     SOURCES
         qminimaleglbackingstore.cpp qminimaleglbackingstore.h
 )
diff --git a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
index 3980ab62f8..b3fca1bd47 100644
--- a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from offscreen.pro.
 
 #####################################################################
-## qoffscreen Plugin:
+## QOffscreenIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qoffscreen
+qt_add_plugin(QOffscreenIntegrationPlugin
+    OUTPUT_NAME qoffscreen
     TYPE platforms
-    CLASS_NAME QOffscreenIntegrationPlugin
     SOURCES
         main.cpp
         qoffscreencommon.cpp qoffscreencommon.h
@@ -32,7 +32,7 @@ qt_add_plugin(qoffscreen
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qoffscreen CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
+qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
     SOURCES
         qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h
     LIBRARIES
diff --git a/src/plugins/platforms/offscreen/CMakeLists.txt b/src/plugins/platforms/offscreen/CMakeLists.txt
index 03576b898e..971f4c888d 100644
--- a/src/plugins/platforms/offscreen/CMakeLists.txt
+++ b/src/plugins/platforms/offscreen/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from offscreen.pro.
 
 #####################################################################
-## qoffscreen Plugin:
+## QOffscreenIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qoffscreen
+qt_add_plugin(QOffscreenIntegrationPlugin
+    OUTPUT_NAME qoffscreen
     TYPE platforms
-    CLASS_NAME QOffscreenIntegrationPlugin
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES offscreen # special case
     SOURCES
         main.cpp
@@ -33,7 +33,7 @@ qt_add_plugin(qoffscreen
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qoffscreen CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
+qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
     SOURCES
         qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h
     LIBRARIES
diff --git a/src/plugins/platforms/vnc/.prev_CMakeLists.txt b/src/plugins/platforms/vnc/.prev_CMakeLists.txt
index 276730755a..28031bb7d1 100644
--- a/src/plugins/platforms/vnc/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/vnc/.prev_CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from vnc.pro.
 
 #####################################################################
-## qvnc Plugin:
+## QVncIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qvnc
+qt_add_plugin(QVncIntegrationPlugin
+    OUTPUT_NAME qvnc
     TYPE platforms
-    CLASS_NAME QVncIntegrationPlugin
     SOURCES
         main.cpp
         qvnc.cpp qvnc_p.h
@@ -40,7 +40,7 @@ qt_add_plugin(qvnc
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qvnc CONDITION TARGET Qt::InputSupportPrivate
+qt_extend_target(QVncIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate
     LIBRARIES
         Qt::InputSupportPrivate
     PUBLIC_LIBRARIES
diff --git a/src/plugins/platforms/vnc/CMakeLists.txt b/src/plugins/platforms/vnc/CMakeLists.txt
index 0b5295287b..502cff06db 100644
--- a/src/plugins/platforms/vnc/CMakeLists.txt
+++ b/src/plugins/platforms/vnc/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from vnc.pro.
 
 #####################################################################
-## qvnc Plugin:
+## QVncIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qvnc
+qt_add_plugin(QVncIntegrationPlugin
+    OUTPUT_NAME qvnc
     TYPE platforms
-    CLASS_NAME QVncIntegrationPlugin
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES vnc # special case
     SOURCES
         main.cpp
@@ -41,7 +41,7 @@ qt_add_plugin(qvnc
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qvnc CONDITION TARGET Qt::InputSupportPrivate
+qt_extend_target(QVncIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate
     LIBRARIES
         Qt::InputSupportPrivate
     PUBLIC_LIBRARIES
diff --git a/src/plugins/platforms/windows/.prev_CMakeLists.txt b/src/plugins/platforms/windows/.prev_CMakeLists.txt
index a23b1643de..fcac46588d 100644
--- a/src/plugins/platforms/windows/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/windows/.prev_CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from windows.pro.
 
 #####################################################################
-## qwindows Plugin:
+## QWindowsIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qwindows
+qt_add_plugin(QWindowsIntegrationPlugin
+    OUTPUT_NAME qwindows
     TYPE platforms
-    CLASS_NAME QWindowsIntegrationPlugin
     SOURCES
         main.cpp
         qtwindowsglobal.h
@@ -75,7 +75,7 @@ set(openglblacklists_resource_files
     "openglblacklists/default.json"
 )
 
-qt_add_resource(qwindows "openglblacklists"
+qt_add_resource(QWindowsIntegrationPlugin "openglblacklists"
     PREFIX
         "/qt-project.org/windows/openglblacklists"
     FILES
@@ -89,7 +89,7 @@ qt_add_resource(qwindows "openglblacklists"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
     SOURCES
         uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h
         uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h
@@ -115,7 +115,7 @@ qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility
         Qt::AccessibilitySupport
 )
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_vulkan
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan
     SOURCES
         qwindowsvulkaninstance.cpp qwindowsvulkaninstance.h
     LIBRARIES
@@ -127,59 +127,59 @@ qt_extend_target(qwindows CONDITION QT_FEATURE_vulkan
 #### Keys ignored in scope 4:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl AND NOT QT_FEATURE_opengles2
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl AND NOT QT_FEATURE_opengles2
     PUBLIC_LIBRARIES
         opengl32
 )
 
-qt_extend_target(qwindows CONDITION mingw
+qt_extend_target(QWindowsIntegrationPlugin CONDITION mingw
     PUBLIC_LIBRARIES
         uuid
 )
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_opengl
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl
     SOURCES
         qwindowsopenglcontext.h
 )
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_opengles2
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengles2
     SOURCES
         qwindowseglcontext.cpp qwindowseglcontext.h
 )
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2
     SOURCES
         qwindowsglcontext.cpp qwindowsglcontext.h
 )
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_dynamicgl
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_dynamicgl
     SOURCES
         qwindowseglcontext.cpp qwindowseglcontext.h
 )
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_systemtrayicon
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_systemtrayicon
     SOURCES
         qwindowssystemtrayicon.cpp qwindowssystemtrayicon.h
 )
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_clipboard
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard
     SOURCES
         qwindowsclipboard.cpp qwindowsclipboard.h
 )
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop
     SOURCES
         qwindowsdrag.cpp qwindowsdrag.h
 )
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_tabletevent
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_tabletevent
     SOURCES
         qwindowstabletsupport.cpp qwindowstabletsupport.h
     INCLUDE_DIRECTORIES
         ${QT_SOURCE_TREE}/src/3rdparty/wintab
 )
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_sessionmanager
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_sessionmanager
     SOURCES
         qwindowssessionmanager.cpp qwindowssessionmanager.h
 )
@@ -210,7 +210,7 @@ if(QT_FEATURE_imageformat_png)
         "images/splitvcursor_64.png"
     )
 
-    qt_add_resource(qwindows "cursors"
+    qt_add_resource(QWindowsIntegrationPlugin "cursors"
         PREFIX
             "/qt-project.org/windows/cursors"
         FILES
@@ -218,25 +218,25 @@ if(QT_FEATURE_imageformat_png)
     )
 endif()
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate
     LIBRARIES
         Qt::WindowsUIAutomationSupportPrivate
     PUBLIC_LIBRARIES
         Qt::WindowsUIAutomationSupport
 )
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility AND mingw
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility AND mingw
     PUBLIC_LIBRARIES
         uuid
 )
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_combined_angle_lib
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_combined_angle_lib
     DEFINES
         LIBEGL_NAME=
         LIBGLESV2_NAME=
 )
 
-qt_extend_target(qwindows CONDITION NOT QT_FEATURE_combined_angle_lib
+qt_extend_target(QWindowsIntegrationPlugin CONDITION NOT QT_FEATURE_combined_angle_lib
     DEFINES
         LIBEGL_NAME=
         LIBGLESV2_NAME=
diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt
index 7b07bcf5de..1c017ed2e5 100644
--- a/src/plugins/platforms/windows/CMakeLists.txt
+++ b/src/plugins/platforms/windows/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from windows.pro.
 
 #####################################################################
-## qwindows Plugin:
+## QWindowsIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qwindows
+qt_add_plugin(QWindowsIntegrationPlugin
+    OUTPUT_NAME qwindows
     TYPE platforms
-    CLASS_NAME QWindowsIntegrationPlugin
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES windows # special case
     SOURCES
         main.cpp
@@ -76,7 +76,7 @@ set(openglblacklists_resource_files
     "openglblacklists/default.json"
 )
 
-qt_add_resource(qwindows "openglblacklists"
+qt_add_resource(QWindowsIntegrationPlugin "openglblacklists"
     PREFIX
         "/qt-project.org/windows/openglblacklists"
     FILES
@@ -90,7 +90,7 @@ qt_add_resource(qwindows "openglblacklists"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
     SOURCES
         uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h
         uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h
@@ -116,7 +116,7 @@ qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility
         Qt::AccessibilitySupport
 )
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_vulkan
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan
     SOURCES
         qwindowsvulkaninstance.cpp qwindowsvulkaninstance.h
     LIBRARIES
@@ -128,59 +128,59 @@ qt_extend_target(qwindows CONDITION QT_FEATURE_vulkan
 #### Keys ignored in scope 4:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl AND NOT QT_FEATURE_opengles2
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl AND NOT QT_FEATURE_opengles2
     PUBLIC_LIBRARIES
         opengl32
 )
 
-qt_extend_target(qwindows CONDITION mingw
+qt_extend_target(QWindowsIntegrationPlugin CONDITION mingw
     PUBLIC_LIBRARIES
         uuid
 )
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_opengl
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl
     SOURCES
         qwindowsopenglcontext.h
 )
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_opengles2
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengles2
     SOURCES
         qwindowseglcontext.cpp qwindowseglcontext.h
 )
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2
     SOURCES
         qwindowsglcontext.cpp qwindowsglcontext.h
 )
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_dynamicgl
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_dynamicgl
     SOURCES
         qwindowseglcontext.cpp qwindowseglcontext.h
 )
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_systemtrayicon
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_systemtrayicon
     SOURCES
         qwindowssystemtrayicon.cpp qwindowssystemtrayicon.h
 )
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_clipboard
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard
     SOURCES
         qwindowsclipboard.cpp qwindowsclipboard.h
 )
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop
     SOURCES
         qwindowsdrag.cpp qwindowsdrag.h
 )
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_tabletevent
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_tabletevent
     SOURCES
         qwindowstabletsupport.cpp qwindowstabletsupport.h
     INCLUDE_DIRECTORIES
         ${QT_SOURCE_TREE}/src/3rdparty/wintab
 )
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_sessionmanager
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_sessionmanager
     SOURCES
         qwindowssessionmanager.cpp qwindowssessionmanager.h
 )
@@ -211,7 +211,7 @@ if(QT_FEATURE_imageformat_png)
         "images/splitvcursor_64.png"
     )
 
-    qt_add_resource(qwindows "cursors"
+    qt_add_resource(QWindowsIntegrationPlugin "cursors"
         PREFIX
             "/qt-project.org/windows/cursors"
         FILES
@@ -219,19 +219,19 @@ if(QT_FEATURE_imageformat_png)
     )
 endif()
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate
     LIBRARIES
         Qt::WindowsUIAutomationSupportPrivate
     PUBLIC_LIBRARIES
         Qt::WindowsUIAutomationSupport
 )
 
-qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility AND mingw
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility AND mingw
     PUBLIC_LIBRARIES
         uuid
 )
 
 # special case:
-# extend_target(qwindows CONDITION QT_FEATURE_combined_angle_lib ...
-# extend_target(qwindows CONDITION NOT QT_FEATURE_combined_angle_lib ...
+# qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_combined_angle_lib ...
+# qt_extend_target(QWindowsIntegrationPlugin CONDITION NOT QT_FEATURE_combined_angle_lib ...
 
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt
index 1d1833450b..14d91295aa 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from xcb_egl.pro.
 
 #####################################################################
-## qxcb-egl-integration Plugin:
+## QXcbEglIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qxcb-egl-integration
+qt_add_plugin(QXcbEglIntegrationPlugin
+    OUTPUT_NAME qxcb-egl-integration
     TYPE xcbglintegrations
-    CLASS_NAME QXcbEglIntegrationPlugin
     SOURCES
         qxcbeglcontext.h
         qxcbeglintegration.cpp qxcbeglintegration.h
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
index dfb74d7138..494392ad1a 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from xcb_glx.pro.
 
 #####################################################################
-## qxcb-glx-integration Plugin:
+## QXcbGlxIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qxcb-glx-integration
+qt_add_plugin(QXcbGlxIntegrationPlugin
+    OUTPUT_NAME qxcb-glx-integration
     TYPE xcbglintegrations
-    CLASS_NAME QXcbGlxIntegrationPlugin
     SOURCES
         qglxintegration.cpp qglxintegration.h
         qxcbglxintegration.cpp qxcbglxintegration.h
@@ -33,12 +33,12 @@ qt_add_plugin(qxcb-glx-integration
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qxcb-glx-integration CONDITION QT_FEATURE_xcb_glx
+qt_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_xcb_glx
     PUBLIC_LIBRARIES
         XCB::GLX
 )
 
-qt_extend_target(qxcb-glx-integration CONDITION QT_FEATURE_dlopen AND NOT static
+qt_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_dlopen AND NOT static
     PUBLIC_LIBRARIES
         ${CMAKE_DL_LIBS}
 )