CMake: Rename qt6_add_plugin TYPE option to PLUGIN_TYPE

The intention is to remove TYPE as a keyword completely before 6.2.0
release, but in case if that's not possible due to the large amount
of repositories and examples, just print a deprecation warning for
now and handle both TYPE and PLUGIN_TYPE.

Task-number: QTBUG-95170
Pick-to: 6.2
Change-Id: If0c18345483b9254b0fc21120229fcc2a2fbfbf5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

61 files changed, 80 insertions, 62 deletions

diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake
index 622505689a..4c85873f6b 100644
--- a/src/corelib/Qt6CoreMacros.cmake
+++ b/src/corelib/Qt6CoreMacros.cmake
@@ -1770,7 +1770,11 @@ macro(_qt_internal_get_add_plugin_keywords option_args single_args multi_args)
         SHARED
     )
     set(${single_args}
+        # TODO: For backward compatibility / transitional use only, remove once all repos no longer
+        # use it
         TYPE
+
+        PLUGIN_TYPE
         CLASS_NAME
         OUTPUT_NAME
     )
@@ -1800,6 +1804,20 @@ function(qt6_add_plugin target)
         unset(arg_CLASSNAME)
     endif()
 
+    # Handle the inconsistent TYPE/PLUGIN_TYPE keyword naming between commands
+    if(arg_TYPE)
+        if(arg_PLUGIN_TYPE AND NOT arg_TYPE STREQUAL arg_PLUGIN_TYPE)
+            message(FATAL_ERROR
+                "Both TYPE and PLUGIN_TYPE were given and were different. "
+                "Only one of the two should be used."
+            )
+        endif()
+        message(AUTHOR_WARNING
+            "The TYPE keyword is deprecated and will be removed soon. Please use PLUGIN_TYPE instead.")
+        set(arg_PLUGIN_TYPE "${arg_TYPE}")
+        unset(arg_TYPE)
+    endif()
+
     if(arg_STATIC AND arg_SHARED)
         message(FATAL_ERROR
             "Both STATIC and SHARED options were given. Only one of the two should be used."
@@ -1844,13 +1862,13 @@ function(qt6_add_plugin target)
     if (ANDROID)
         set_target_properties(${target}
             PROPERTIES
-            LIBRARY_OUTPUT_NAME "plugins_${arg_TYPE}_${output_name}"
+            LIBRARY_OUTPUT_NAME "plugins_${arg_PLUGIN_TYPE}_${output_name}"
         )
     endif()
 
     # Derive the class name from the target name if it's not explicitly specified.
     set(plugin_class_name "")
-    if (NOT "${arg_TYPE}" STREQUAL "qml_plugin")
+    if (NOT "${arg_PLUGIN_TYPE}" STREQUAL "qml_plugin")
         if (NOT arg_CLASS_NAME)
             set(plugin_class_name "${target}")
         else()
diff --git a/src/plugins/generic/evdevkeyboard/CMakeLists.txt b/src/plugins/generic/evdevkeyboard/CMakeLists.txt
index 7134a2d858..1568ac82cb 100644
--- a/src/plugins/generic/evdevkeyboard/CMakeLists.txt
+++ b/src/plugins/generic/evdevkeyboard/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QEvdevKeyboardPlugin
     OUTPUT_NAME qevdevkeyboardplugin
-    TYPE generic
+    PLUGIN_TYPE generic
     DEFAULT_IF FALSE
     SOURCES
         main.cpp
diff --git a/src/plugins/generic/evdevmouse/CMakeLists.txt b/src/plugins/generic/evdevmouse/CMakeLists.txt
index 78cf80f588..f467f631f5 100644
--- a/src/plugins/generic/evdevmouse/CMakeLists.txt
+++ b/src/plugins/generic/evdevmouse/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QEvdevMousePlugin
     OUTPUT_NAME qevdevmouseplugin
-    TYPE generic
+    PLUGIN_TYPE generic
     DEFAULT_IF FALSE
     SOURCES
         main.cpp
diff --git a/src/plugins/generic/evdevtablet/CMakeLists.txt b/src/plugins/generic/evdevtablet/CMakeLists.txt
index 880090dd02..4f39c1be87 100644
--- a/src/plugins/generic/evdevtablet/CMakeLists.txt
+++ b/src/plugins/generic/evdevtablet/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QEvdevTabletPlugin
     OUTPUT_NAME qevdevtabletplugin
-    TYPE generic
+    PLUGIN_TYPE generic
     DEFAULT_IF FALSE
     SOURCES
         main.cpp
diff --git a/src/plugins/generic/evdevtouch/CMakeLists.txt b/src/plugins/generic/evdevtouch/CMakeLists.txt
index d15367c6c2..4b90efbd69 100644
--- a/src/plugins/generic/evdevtouch/CMakeLists.txt
+++ b/src/plugins/generic/evdevtouch/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QEvdevTouchScreenPlugin
     OUTPUT_NAME qevdevtouchplugin
-    TYPE generic
+    PLUGIN_TYPE generic
     DEFAULT_IF FALSE
     SOURCES
         main.cpp
diff --git a/src/plugins/generic/libinput/CMakeLists.txt b/src/plugins/generic/libinput/CMakeLists.txt
index 79da268510..bf423c601d 100644
--- a/src/plugins/generic/libinput/CMakeLists.txt
+++ b/src/plugins/generic/libinput/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QLibInputPlugin
     OUTPUT_NAME qlibinputplugin
-    TYPE generic
+    PLUGIN_TYPE generic
     DEFAULT_IF FALSE
     SOURCES
         main.cpp
diff --git a/src/plugins/generic/tslib/CMakeLists.txt b/src/plugins/generic/tslib/CMakeLists.txt
index 9a6e368825..42d6f59b13 100644
--- a/src/plugins/generic/tslib/CMakeLists.txt
+++ b/src/plugins/generic/tslib/CMakeLists.txt
@@ -8,7 +8,7 @@ qt_find_package(Tslib) # special case
 
 qt_internal_add_plugin(QTsLibPlugin
     OUTPUT_NAME qtslibplugin
-    TYPE generic
+    PLUGIN_TYPE generic
     DEFAULT_IF FALSE
     SOURCES
         main.cpp
diff --git a/src/plugins/generic/tuiotouch/CMakeLists.txt b/src/plugins/generic/tuiotouch/CMakeLists.txt
index b572b140b4..8271216182 100644
--- a/src/plugins/generic/tuiotouch/CMakeLists.txt
+++ b/src/plugins/generic/tuiotouch/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QTuioTouchPlugin
     OUTPUT_NAME qtuiotouchplugin
-    TYPE generic
+    PLUGIN_TYPE generic
     DEFAULT_IF FALSE
     SOURCES
         main.cpp
diff --git a/src/plugins/imageformats/gif/CMakeLists.txt b/src/plugins/imageformats/gif/CMakeLists.txt
index 1ffd702f85..fc9d013e75 100644
--- a/src/plugins/imageformats/gif/CMakeLists.txt
+++ b/src/plugins/imageformats/gif/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QGifPlugin
     OUTPUT_NAME qgif
-    TYPE imageformats
+    PLUGIN_TYPE imageformats
     SOURCES
         main.cpp main.h
         qgifhandler.cpp qgifhandler_p.h
diff --git a/src/plugins/imageformats/ico/CMakeLists.txt b/src/plugins/imageformats/ico/CMakeLists.txt
index 2d1dc38e17..4d6f765e5a 100644
--- a/src/plugins/imageformats/ico/CMakeLists.txt
+++ b/src/plugins/imageformats/ico/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QICOPlugin
     OUTPUT_NAME qico
-    TYPE imageformats
+    PLUGIN_TYPE imageformats
     SOURCES
         main.cpp main.h
         qicohandler.cpp qicohandler.h
diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt
index c13c6807e1..54c6441a14 100644
--- a/src/plugins/imageformats/jpeg/CMakeLists.txt
+++ b/src/plugins/imageformats/jpeg/CMakeLists.txt
@@ -8,7 +8,7 @@ qt_find_package(JPEG) # special case
 
 qt_internal_add_plugin(QJpegPlugin
     OUTPUT_NAME qjpeg
-    TYPE imageformats
+    PLUGIN_TYPE imageformats
     SOURCES
         main.cpp main.h
         qjpeghandler.cpp qjpeghandler_p.h
diff --git a/src/plugins/networkinformation/android/CMakeLists.txt b/src/plugins/networkinformation/android/CMakeLists.txt
index f1d260547a..de05bdfb1c 100644
--- a/src/plugins/networkinformation/android/CMakeLists.txt
+++ b/src/plugins/networkinformation/android/CMakeLists.txt
@@ -17,7 +17,7 @@ install_jar(Qt${QtBase_VERSION_MAJOR}AndroidNetworkInformationBackend
 qt_internal_add_plugin(QAndroidNetworkInformationPlugin
     OUTPUT_NAME androidnetworkinformation
     CLASS_NAME QAndroidNetworkInformationBackendFactory
-    TYPE networkinformation
+    PLUGIN_TYPE networkinformation
     DEFAULT_IF ANDROID
     SOURCES
         qandroidnetworkinformationbackend.cpp
diff --git a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
index 1ffdfdec17..ab6fdf1d0a 100644
--- a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
+++ b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
@@ -1,7 +1,7 @@
 qt_internal_add_plugin(QNLMNIPlugin
     OUTPUT_NAME networklistmanager
     CLASS_NAME QNetworkListManagerNetworkInformationBackendFactory
-    TYPE networkinformation
+    PLUGIN_TYPE networkinformation
     DEFAULT_IF WIN32 AND QT_FEATURE_networklistmanager
     SOURCES qnetworklistmanagernetworkinformationbackend.cpp
     LIBRARIES
diff --git a/src/plugins/networkinformation/networkmanager/CMakeLists.txt b/src/plugins/networkinformation/networkmanager/CMakeLists.txt
index a80a7ac656..514b35fdd9 100644
--- a/src/plugins/networkinformation/networkmanager/CMakeLists.txt
+++ b/src/plugins/networkinformation/networkmanager/CMakeLists.txt
@@ -1,7 +1,7 @@
 qt_internal_add_plugin(QNetworkManagerNetworkInformationPlugin
     OUTPUT_NAME networkmanager
     CLASS_NAME QNetworkManagerNetworkInformationBackendFactory
-    TYPE networkinformation
+    PLUGIN_TYPE networkinformation
     DEFAULT_IF LINUX
     SOURCES
         qnetworkmanagernetworkinformationbackend.cpp
diff --git a/src/plugins/networkinformation/scnetworkreachability/CMakeLists.txt b/src/plugins/networkinformation/scnetworkreachability/CMakeLists.txt
index 6a15bde1c0..f7875526f6 100644
--- a/src/plugins/networkinformation/scnetworkreachability/CMakeLists.txt
+++ b/src/plugins/networkinformation/scnetworkreachability/CMakeLists.txt
@@ -1,7 +1,7 @@
 qt_internal_add_plugin(QSCNetworkReachabilityNetworkInformationPlugin
     OUTPUT_NAME scnetworkreachability
     CLASS_NAME QSCNetworkReachabilityNetworkInformationBackendFactory
-    TYPE networkinformation
+    PLUGIN_TYPE networkinformation
     DEFAULT_IF APPLE
     SOURCES
         qscnetworkreachabilitynetworkinformationbackend.mm
diff --git a/src/plugins/platforminputcontexts/compose/CMakeLists.txt b/src/plugins/platforminputcontexts/compose/CMakeLists.txt
index fe14de36f4..e3fbf913b9 100644
--- a/src/plugins/platforminputcontexts/compose/CMakeLists.txt
+++ b/src/plugins/platforminputcontexts/compose/CMakeLists.txt
@@ -9,7 +9,7 @@ pkg_get_variable(PKG_X11_PREFIX x11 prefix) # special case
 
 qt_internal_add_plugin(QComposePlatformInputContextPlugin
     OUTPUT_NAME composeplatforminputcontextplugin
-    TYPE platforminputcontexts
+    PLUGIN_TYPE platforminputcontexts
     DEFAULT_IF FALSE
     SOURCES
         qcomposeplatforminputcontext.cpp qcomposeplatforminputcontext.h
diff --git a/src/plugins/platforminputcontexts/ibus/CMakeLists.txt b/src/plugins/platforminputcontexts/ibus/CMakeLists.txt
index 6d6de4fe8b..7ccc627eb1 100644
--- a/src/plugins/platforminputcontexts/ibus/CMakeLists.txt
+++ b/src/plugins/platforminputcontexts/ibus/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QIbusPlatformInputContextPlugin
     OUTPUT_NAME ibusplatforminputcontextplugin
-    TYPE platforminputcontexts
+    PLUGIN_TYPE platforminputcontexts
     DEFAULT_IF FALSE
     SOURCES
         main.cpp
diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt
index 7f9150d4bf..416e25c28a 100644
--- a/src/plugins/platforms/android/CMakeLists.txt
+++ b/src/plugins/platforms/android/CMakeLists.txt
@@ -7,7 +7,7 @@ qt_find_package(EGL) # special case
 
 qt_internal_add_plugin(QAndroidIntegrationPlugin
     OUTPUT_NAME qtforandroid
-    TYPE platforms
+    PLUGIN_TYPE platforms
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES android # special case
     SOURCES
         androidcontentfileengine.cpp androidcontentfileengine.h
diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt
index 62eaad8e02..21f87dae83 100644
--- a/src/plugins/platforms/cocoa/CMakeLists.txt
+++ b/src/plugins/platforms/cocoa/CMakeLists.txt
@@ -9,7 +9,7 @@
 qt_internal_add_plugin(QCocoaIntegrationPlugin
     OUTPUT_NAME qcocoa
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES cocoa # special case
-    TYPE platforms
+    PLUGIN_TYPE platforms
     SOURCES
         main.mm
         qcocoaapplication.h qcocoaapplication.mm
diff --git a/src/plugins/platforms/direct2d/CMakeLists.txt b/src/plugins/platforms/direct2d/CMakeLists.txt
index a3ff060e2d..e87d2886d8 100644
--- a/src/plugins/platforms/direct2d/CMakeLists.txt
+++ b/src/plugins/platforms/direct2d/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QWindowsDirect2DIntegrationPlugin
     OUTPUT_NAME qdirect2d
-    TYPE platforms
+    PLUGIN_TYPE platforms
     SOURCES
         ../windows/qtwindowsglobal.h
         ../windows/qwin10helpers.cpp ../windows/qwin10helpers.h
diff --git a/src/plugins/platforms/directfb/CMakeLists.txt b/src/plugins/platforms/directfb/CMakeLists.txt
index e54c6a0b79..c634afb4f8 100644
--- a/src/plugins/platforms/directfb/CMakeLists.txt
+++ b/src/plugins/platforms/directfb/CMakeLists.txt
@@ -11,7 +11,7 @@ qt_find_package(EGL)
 
 qt_internal_add_plugin(QDirectFbIntegrationPlugin
     OUTPUT_NAME qdirectfb
-    TYPE platforms
+    PLUGIN_TYPE platforms
     SOURCES
         main.cpp
         qdirectfbbackingstore.cpp qdirectfbbackingstore.h
diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt
index 4b11c85bad..61adb94778 100644
--- a/src/plugins/platforms/eglfs/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/CMakeLists.txt
@@ -98,7 +98,7 @@ endif()
 
 qt_internal_add_plugin(QEglFSIntegrationPlugin
     OUTPUT_NAME qeglfs
-    TYPE platforms
+    PLUGIN_TYPE platforms
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES eglfs # special case
     SOURCES
         qeglfsmain.cpp
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt
index d496e334b3..e1de63ea42 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QEglFSEmulatorIntegrationPlugin
     OUTPUT_NAME qeglfs-emu-integration
-    TYPE egldeviceintegrations
+    PLUGIN_TYPE egldeviceintegrations
     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 f08b960eb0..a20a4a084d 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
@@ -30,7 +30,7 @@ qt_internal_add_module(EglFsKmsGbmSupportPrivate
 
 qt_internal_add_plugin(QEglFSKmsGbmIntegrationPlugin
     OUTPUT_NAME qeglfs-kms-integration
-    TYPE egldeviceintegrations
+    PLUGIN_TYPE egldeviceintegrations
     SOURCES
         qeglfskmsgbmmain.cpp
     DEFINES
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 bc033c9f05..7cac8ea5dc 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin
     OUTPUT_NAME qeglfs-kms-egldevice-integration
-    TYPE egldeviceintegrations
+    PLUGIN_TYPE egldeviceintegrations
     SOURCES
         qeglfskmsegldevice.cpp qeglfskmsegldevice.h
         qeglfskmsegldeviceintegration.cpp qeglfskmsegldeviceintegration.h
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/CMakeLists.txt
index bb0e7619fc..7550529f79 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QEglFSMaliIntegrationPlugin
     OUTPUT_NAME qeglfs-mali-integration
-    TYPE egldeviceintegrations
+    PLUGIN_TYPE egldeviceintegrations
     SOURCES
         qeglfsmaliintegration.cpp qeglfsmaliintegration.h
         qeglfsmalimain.cpp
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/CMakeLists.txt
index 45c2a0ca4e..fb8b79454d 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QEglFSOpenWFDIntegrationPlugin
     OUTPUT_NAME qeglfs-openwfd-integration
-    TYPE egldeviceintegrations
+    PLUGIN_TYPE egldeviceintegrations
     SOURCES
         qeglfsopenwfdintegration.cpp qeglfsopenwfdintegration.h
         qeglfsopenwfdmain.cpp
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/CMakeLists.txt
index 91195f2b63..988ab76d79 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QEglFSVivIntegrationPlugin
     OUTPUT_NAME qeglfs-viv-integration
-    TYPE egldeviceintegrations
+    PLUGIN_TYPE egldeviceintegrations
     SOURCES
         qeglfsvivintegration.cpp qeglfsvivintegration.h
         qeglfsvivmain.cpp
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/CMakeLists.txt
index 118a805ad7..cb07c9aecc 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QEglFSVivWaylandIntegrationPlugin
     OUTPUT_NAME qeglfs-viv-wl-integration
-    TYPE egldeviceintegrations
+    PLUGIN_TYPE egldeviceintegrations
     SOURCES
         qeglfsvivwlintegration.cpp qeglfsvivwlintegration.h
         qeglfsvivwlmain.cpp
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt
index 24190cd811..18bb02efe0 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QEglFSX11IntegrationPlugin
     OUTPUT_NAME qeglfs-x11-integration
-    TYPE egldeviceintegrations
+    PLUGIN_TYPE egldeviceintegrations
     SOURCES
         qeglfsx11integration.cpp qeglfsx11integration.h
         qeglfsx11main.cpp
diff --git a/src/plugins/platforms/ios/CMakeLists.txt b/src/plugins/platforms/ios/CMakeLists.txt
index b175adcc4a..204add279c 100644
--- a/src/plugins/platforms/ios/CMakeLists.txt
+++ b/src/plugins/platforms/ios/CMakeLists.txt
@@ -7,7 +7,7 @@
 qt_internal_add_plugin(QIOSIntegrationPlugin
     OUTPUT_NAME qios
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES ios # special case
-    TYPE platforms
+    PLUGIN_TYPE platforms
     SOURCES
         plugin.mm
         qiosapplicationdelegate.h qiosapplicationdelegate.mm
diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt
index 76253adb47..a6351edd59 100644
--- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt
+++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QIosOptionalPlugin_NSPhotoLibrary
     OUTPUT_NAME qiosnsphotolibrarysupport
-    TYPE platforms/darwin
+    PLUGIN_TYPE platforms/darwin
     DEFAULT_IF FALSE
     SOURCES
         plugin.mm
diff --git a/src/plugins/platforms/linuxfb/CMakeLists.txt b/src/plugins/platforms/linuxfb/CMakeLists.txt
index 1a241463a7..a671dcfc1e 100644
--- a/src/plugins/platforms/linuxfb/CMakeLists.txt
+++ b/src/plugins/platforms/linuxfb/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QLinuxFbIntegrationPlugin
     OUTPUT_NAME qlinuxfb
-    TYPE platforms
+    PLUGIN_TYPE platforms
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES linuxfb # special case
     SOURCES
         main.cpp
diff --git a/src/plugins/platforms/minimal/CMakeLists.txt b/src/plugins/platforms/minimal/CMakeLists.txt
index 3abecdcb4a..a763dbac9a 100644
--- a/src/plugins/platforms/minimal/CMakeLists.txt
+++ b/src/plugins/platforms/minimal/CMakeLists.txt
@@ -8,7 +8,7 @@ qt_find_package(WrapFreetype PROVIDED_TARGETS WrapFreetype::WrapFreetype) # spec
 
 qt_internal_add_plugin(QMinimalIntegrationPlugin
     OUTPUT_NAME qminimal
-    TYPE platforms
+    PLUGIN_TYPE platforms
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES minimal # special case
     SOURCES
         main.cpp
diff --git a/src/plugins/platforms/minimalegl/CMakeLists.txt b/src/plugins/platforms/minimalegl/CMakeLists.txt
index 5a5b57f963..f285d8ece6 100644
--- a/src/plugins/platforms/minimalegl/CMakeLists.txt
+++ b/src/plugins/platforms/minimalegl/CMakeLists.txt
@@ -7,7 +7,7 @@ qt_find_package(EGL) # special case
 
 qt_internal_add_plugin(QMinimalEglIntegrationPlugin
     OUTPUT_NAME qminimalegl
-    TYPE platforms
+    PLUGIN_TYPE platforms
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES minimalegl # special case
     SOURCES
         main.cpp
diff --git a/src/plugins/platforms/offscreen/CMakeLists.txt b/src/plugins/platforms/offscreen/CMakeLists.txt
index bb73ce38aa..424da0a980 100644
--- a/src/plugins/platforms/offscreen/CMakeLists.txt
+++ b/src/plugins/platforms/offscreen/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QOffscreenIntegrationPlugin
     OUTPUT_NAME qoffscreen
-    TYPE platforms
+    PLUGIN_TYPE platforms
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES offscreen # special case
     SOURCES
         main.cpp
diff --git a/src/plugins/platforms/qnx/CMakeLists.txt b/src/plugins/platforms/qnx/CMakeLists.txt
index 8554874919..3e952e6ddf 100644
--- a/src/plugins/platforms/qnx/CMakeLists.txt
+++ b/src/plugins/platforms/qnx/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QQnxIntegrationPlugin
     OUTPUT_NAME qqnx
-    TYPE platforms
+    PLUGIN_TYPE platforms
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES qnx # special case
     SOURCES
         main.cpp main.h
diff --git a/src/plugins/platforms/vkkhrdisplay/CMakeLists.txt b/src/plugins/platforms/vkkhrdisplay/CMakeLists.txt
index 0110782326..98fb6d39b7 100644
--- a/src/plugins/platforms/vkkhrdisplay/CMakeLists.txt
+++ b/src/plugins/platforms/vkkhrdisplay/CMakeLists.txt
@@ -2,7 +2,7 @@ qt_find_package(WrapFreetype PROVIDED_TARGETS WrapFreetype::WrapFreetype)
 
 qt_internal_add_plugin(QVkKhrDisplayIntegrationPlugin
     OUTPUT_NAME qvkkhrdisplay
-    TYPE platforms
+    PLUGIN_TYPE platforms
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES vkkhrdisplay
     SOURCES
         main.cpp
diff --git a/src/plugins/platforms/vnc/CMakeLists.txt b/src/plugins/platforms/vnc/CMakeLists.txt
index 7c28e26d9b..ca9445207b 100644
--- a/src/plugins/platforms/vnc/CMakeLists.txt
+++ b/src/plugins/platforms/vnc/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QVncIntegrationPlugin
     OUTPUT_NAME qvnc
-    TYPE platforms
+    PLUGIN_TYPE platforms
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES vnc # special case
     SOURCES
         main.cpp
diff --git a/src/plugins/platforms/wasm/CMakeLists.txt b/src/plugins/platforms/wasm/CMakeLists.txt
index bcd828b013..636193141c 100644
--- a/src/plugins/platforms/wasm/CMakeLists.txt
+++ b/src/plugins/platforms/wasm/CMakeLists.txt
@@ -7,7 +7,7 @@
 qt_internal_add_plugin(QWasmIntegrationPlugin
     OUTPUT_NAME qwasm
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES wasm # special case
-    TYPE platforms
+    PLUGIN_TYPE platforms
     STATIC
     SOURCES
         main.cpp
diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt
index f03cf250ea..880fa79ef5 100644
--- a/src/plugins/platforms/windows/CMakeLists.txt
+++ b/src/plugins/platforms/windows/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QWindowsIntegrationPlugin
     OUTPUT_NAME qwindows
-    TYPE platforms
+    PLUGIN_TYPE platforms
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES windows # special case
     SOURCES
         main.cpp
diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt
index 83f4d5b209..48c44a92ab 100644
--- a/src/plugins/platforms/xcb/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/CMakeLists.txt
@@ -162,7 +162,7 @@ endif()
 
 qt_internal_add_plugin(QXcbIntegrationPlugin
     OUTPUT_NAME qxcb
-    TYPE platforms
+    PLUGIN_TYPE platforms
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES xcb # special case
     SOURCES
         qxcbmain.cpp
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 d24050edf3..4a62c8ad46 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt
@@ -8,7 +8,7 @@ qt_find_package(EGL) # special case
 
 qt_internal_add_plugin(QXcbEglIntegrationPlugin
     OUTPUT_NAME qxcb-egl-integration
-    TYPE xcbglintegrations
+    PLUGIN_TYPE xcbglintegrations
     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 80f785a2f0..ae81eba545 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QXcbGlxIntegrationPlugin
     OUTPUT_NAME qxcb-glx-integration
-    TYPE xcbglintegrations
+    PLUGIN_TYPE xcbglintegrations
     SOURCES
         qglxintegration.cpp qglxintegration.h
         qxcbglxintegration.cpp qxcbglxintegration.h
diff --git a/src/plugins/platformthemes/gtk3/CMakeLists.txt b/src/plugins/platformthemes/gtk3/CMakeLists.txt
index da61354237..62e752bd92 100644
--- a/src/plugins/platformthemes/gtk3/CMakeLists.txt
+++ b/src/plugins/platformthemes/gtk3/CMakeLists.txt
@@ -9,7 +9,7 @@ qt_find_package(X11) # special case
 
 qt_internal_add_plugin(QGtk3ThemePlugin
     OUTPUT_NAME qgtk3
-    TYPE platformthemes
+    PLUGIN_TYPE platformthemes
     DEFAULT_IF FALSE
     SOURCES
         main.cpp
diff --git a/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt b/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt
index 980ef4a44a..82fb94e31d 100644
--- a/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt
+++ b/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QXdgDesktopPortalThemePlugin
     OUTPUT_NAME qxdgdesktopportal
-    TYPE platformthemes
+    PLUGIN_TYPE platformthemes
     DEFAULT_IF FALSE
     SOURCES
         main.cpp
diff --git a/src/plugins/printsupport/cups/CMakeLists.txt b/src/plugins/printsupport/cups/CMakeLists.txt
index 0a8b2253af..1132ff0845 100644
--- a/src/plugins/printsupport/cups/CMakeLists.txt
+++ b/src/plugins/printsupport/cups/CMakeLists.txt
@@ -8,7 +8,7 @@ qt_find_package(Cups PROVIDED_TARGETS Cups::Cups) # special case
 
 qt_internal_add_plugin(QCupsPrinterSupportPlugin
     OUTPUT_NAME cupsprintersupport
-    TYPE printsupport
+    PLUGIN_TYPE printsupport
     SOURCES
         main.cpp
         qcupsprintengine.cpp qcupsprintengine_p.h
diff --git a/src/plugins/sqldrivers/db2/CMakeLists.txt b/src/plugins/sqldrivers/db2/CMakeLists.txt
index de90d92581..1c693faa3b 100644
--- a/src/plugins/sqldrivers/db2/CMakeLists.txt
+++ b/src/plugins/sqldrivers/db2/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QDB2DriverPlugin
     OUTPUT_NAME qsqldb2
-    TYPE sqldrivers
+    PLUGIN_TYPE sqldrivers
     SOURCES
         main.cpp
         qsql_db2.cpp qsql_db2_p.h
diff --git a/src/plugins/sqldrivers/ibase/CMakeLists.txt b/src/plugins/sqldrivers/ibase/CMakeLists.txt
index 4b914401ed..8cd5c24dfc 100644
--- a/src/plugins/sqldrivers/ibase/CMakeLists.txt
+++ b/src/plugins/sqldrivers/ibase/CMakeLists.txt
@@ -1,6 +1,6 @@
 qt_internal_add_plugin(QIBaseDriverPlugin
     OUTPUT_NAME qsqlibase
-    TYPE sqldrivers
+    PLUGIN_TYPE sqldrivers
     SOURCES
         main.cpp
         qsql_ibase.cpp qsql_ibase_p.h
diff --git a/src/plugins/sqldrivers/mysql/CMakeLists.txt b/src/plugins/sqldrivers/mysql/CMakeLists.txt
index 0679bcb698..a05fc513f1 100644
--- a/src/plugins/sqldrivers/mysql/CMakeLists.txt
+++ b/src/plugins/sqldrivers/mysql/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QMYSQLDriverPlugin
     OUTPUT_NAME qsqlmysql
-    TYPE sqldrivers
+    PLUGIN_TYPE sqldrivers
     SOURCES
         main.cpp
         qsql_mysql.cpp qsql_mysql_p.h
diff --git a/src/plugins/sqldrivers/oci/CMakeLists.txt b/src/plugins/sqldrivers/oci/CMakeLists.txt
index 4830586064..15ab7f7f87 100644
--- a/src/plugins/sqldrivers/oci/CMakeLists.txt
+++ b/src/plugins/sqldrivers/oci/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QOCIDriverPlugin
     OUTPUT_NAME qsqloci
-    TYPE sqldrivers
+    PLUGIN_TYPE sqldrivers
     SOURCES
         main.cpp
         qsql_oci.cpp qsql_oci_p.h
diff --git a/src/plugins/sqldrivers/odbc/CMakeLists.txt b/src/plugins/sqldrivers/odbc/CMakeLists.txt
index 032d89a244..1bbae1b3ec 100644
--- a/src/plugins/sqldrivers/odbc/CMakeLists.txt
+++ b/src/plugins/sqldrivers/odbc/CMakeLists.txt
@@ -8,7 +8,7 @@ qt_find_package(ODBC) # special case
 
 qt_internal_add_plugin(QODBCDriverPlugin
     OUTPUT_NAME qsqlodbc
-    TYPE sqldrivers
+    PLUGIN_TYPE sqldrivers
     SOURCES
         main.cpp
         qsql_odbc.cpp qsql_odbc_p.h
diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt
index 648d29f582..8ed84c9028 100644
--- a/src/plugins/sqldrivers/psql/CMakeLists.txt
+++ b/src/plugins/sqldrivers/psql/CMakeLists.txt
@@ -8,7 +8,7 @@ qt_find_package(PostgreSQL) # special case
 
 qt_internal_add_plugin(QPSQLDriverPlugin
     OUTPUT_NAME qsqlpsql
-    TYPE sqldrivers
+    PLUGIN_TYPE sqldrivers
     SOURCES
         main.cpp
         qsql_psql.cpp qsql_psql_p.h
diff --git a/src/plugins/sqldrivers/sqlite/CMakeLists.txt b/src/plugins/sqldrivers/sqlite/CMakeLists.txt
index bbd03e451f..49479df482 100644
--- a/src/plugins/sqldrivers/sqlite/CMakeLists.txt
+++ b/src/plugins/sqldrivers/sqlite/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QSQLiteDriverPlugin
     OUTPUT_NAME qsqlite
-    TYPE sqldrivers
+    PLUGIN_TYPE sqldrivers
     SOURCES
         qsql_sqlite.cpp qsql_sqlite_p.h
         smain.cpp
diff --git a/src/plugins/styles/android/CMakeLists.txt b/src/plugins/styles/android/CMakeLists.txt
index 312f8ecfff..3dc0ed1e2e 100644
--- a/src/plugins/styles/android/CMakeLists.txt
+++ b/src/plugins/styles/android/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QAndroidStylePlugin
     OUTPUT_NAME qandroidstyle
-    TYPE styles
+    PLUGIN_TYPE styles
     SOURCES
         main.cpp
         qandroidstyle.cpp qandroidstyle_p.h
diff --git a/src/plugins/styles/mac/CMakeLists.txt b/src/plugins/styles/mac/CMakeLists.txt
index f95579b474..98d6791d82 100644
--- a/src/plugins/styles/mac/CMakeLists.txt
+++ b/src/plugins/styles/mac/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QMacStylePlugin
     OUTPUT_NAME qmacstyle
-    TYPE styles
+    PLUGIN_TYPE styles
     SOURCES
         main.mm
         qmacstyle_mac.mm qmacstyle_mac_p.h
diff --git a/src/plugins/styles/windowsvista/CMakeLists.txt b/src/plugins/styles/windowsvista/CMakeLists.txt
index f668b21632..efd552ab08 100644
--- a/src/plugins/styles/windowsvista/CMakeLists.txt
+++ b/src/plugins/styles/windowsvista/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_plugin(QWindowsVistaStylePlugin
     OUTPUT_NAME qwindowsvistastyle
-    TYPE styles
+    PLUGIN_TYPE styles
     SOURCES
         main.cpp
         qwindowsvistastyle.cpp qwindowsvistastyle_p.h
diff --git a/src/plugins/tls/certonly/CMakeLists.txt b/src/plugins/tls/certonly/CMakeLists.txt
index 1c8cc0de15..0e805d519c 100644
--- a/src/plugins/tls/certonly/CMakeLists.txt
+++ b/src/plugins/tls/certonly/CMakeLists.txt
@@ -1,7 +1,7 @@
 qt_internal_add_plugin(QTlsBackendCertOnlyPlugin
     OUTPUT_NAME certonlybackend
     CLASS_NAME QTlsBackendCertOnly
-    TYPE tls
+    PLUGIN_TYPE tls
     DEFAULT_IF NOT QT_FEATURE_securetransport AND NOT (QT_FEATURE_openssl OR QT_FEATURE_openssl_linked) AND NOT QT_FEATURE_schannel
     SOURCES
         ../shared/qx509_base_p.h
diff --git a/src/plugins/tls/openssl/CMakeLists.txt b/src/plugins/tls/openssl/CMakeLists.txt
index 4e1c711aa8..aec3f874f1 100644
--- a/src/plugins/tls/openssl/CMakeLists.txt
+++ b/src/plugins/tls/openssl/CMakeLists.txt
@@ -1,7 +1,7 @@
 qt_internal_add_plugin(QTlsBackendOpenSSLPlugin
     OUTPUT_NAME opensslbackend
     CLASS_NAME QTlsBackendOpenSSL
-    TYPE tls
+    PLUGIN_TYPE tls
     SOURCES
         ../shared/qx509_base.cpp ../shared/qx509_base_p.h
         ../shared/qtlskey_base.cpp ../shared/qtlskey_base_p.h
diff --git a/src/plugins/tls/schannel/CMakeLists.txt b/src/plugins/tls/schannel/CMakeLists.txt
index b875e85de9..3489dcef62 100644
--- a/src/plugins/tls/schannel/CMakeLists.txt
+++ b/src/plugins/tls/schannel/CMakeLists.txt
@@ -1,7 +1,7 @@
 qt_internal_add_plugin(QSchannelBackendPlugin
     OUTPUT_NAME schannelbackend
     CLASS_NAME QSchannelBackend
-    TYPE tls
+    PLUGIN_TYPE tls
     DEFAULT_IF WIN32
     SOURCES
         ../shared/qtlskey_base_p.h
diff --git a/src/plugins/tls/securetransport/CMakeLists.txt b/src/plugins/tls/securetransport/CMakeLists.txt
index 23ec54176e..60713355ee 100644
--- a/src/plugins/tls/securetransport/CMakeLists.txt
+++ b/src/plugins/tls/securetransport/CMakeLists.txt
@@ -1,7 +1,7 @@
 qt_internal_add_plugin(QSecureTransportBackendPlugin
     OUTPUT_NAME securetransportbackend
     CLASS_NAME QSecureTransportBackend
-    TYPE tls
+    PLUGIN_TYPE tls
     DEFAULT_IF APPLE
     SOURCES
         ../shared/qsslsocket_mac_shared.cpp