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>
2021-08-04 16:18:44 +02:00 · 2021-08-04 16:18:44 +02:00 · b2f00dfb46
commit b2f00dfb46
parent eb4fb9fa32
71 changed files with 108 additions and 79 deletions
--- a/cmake/QtPluginHelpers.cmake
+++ b/cmake/QtPluginHelpers.cmake
@ -20,7 +20,7 @@ macro(qt_internal_get_internal_add_plugin_keywords option_args single_args multi
 endmacro()

 # This is the main entry point for defining Qt plugins.
-# A CMake target is created with the given target. The TYPE parameter is needed to place the
+# A CMake target is created with the given target. The PLUGIN_TYPE parameter is needed to place the
 # plugin into the correct plugins/ sub-directory.
 function(qt_internal_add_plugin target)
    qt_internal_set_qt_known_plugins("${QT_KNOWN_PLUGINS}" "${target}")
@ -78,15 +78,25 @@ function(qt_internal_add_plugin target)
    qt6_add_plugin(${target} ${plugin_args})
    qt_internal_mark_as_internal_library(${target})

-    qt_get_sanitized_plugin_type("${arg_TYPE}" plugin_type_escaped)
+    set(plugin_type "")
+    # TODO: Transitional: Remove the TYPE option handling after all repos have been converted to use
+    # PLUGIN_TYPE.
+    if(arg_TYPE)
+        set(plugin_type "${arg_TYPE}")
+    elseif(arg_PLUGIN_TYPE)
+        set(plugin_type "${arg_PLUGIN_TYPE}")
+    endif()

-    set(output_directory_default "${QT_BUILD_DIR}/${INSTALL_PLUGINSDIR}/${arg_TYPE}")
-    set(install_directory_default "${INSTALL_PLUGINSDIR}/${arg_TYPE}")
+    qt_get_sanitized_plugin_type("${plugin_type}" plugin_type_escaped)

-    qt_internal_check_directory_or_type(OUTPUT_DIRECTORY "${arg_OUTPUT_DIRECTORY}" "${arg_TYPE}"
+    set(output_directory_default "${QT_BUILD_DIR}/${INSTALL_PLUGINSDIR}/${plugin_type}")
+    set(install_directory_default "${INSTALL_PLUGINSDIR}/${plugin_type}")
+
+    qt_internal_check_directory_or_type(OUTPUT_DIRECTORY "${arg_OUTPUT_DIRECTORY}" "${plugin_type}"
        "${output_directory_default}" output_directory)
    if (NOT arg_SKIP_INSTALL)
-        qt_internal_check_directory_or_type(INSTALL_DIRECTORY "${arg_INSTALL_DIRECTORY}" "${arg_TYPE}"
+        qt_internal_check_directory_or_type(INSTALL_DIRECTORY "${arg_INSTALL_DIRECTORY}"
+            "${plugin_type}"
            "${install_directory_default}" install_directory)
        set(archive_install_directory ${arg_ARCHIVE_INSTALL_DIRECTORY})
        if (NOT archive_install_directory AND install_directory)
@ -126,7 +136,7 @@ function(qt_internal_add_plugin target)
        ARCHIVE_OUTPUT_DIRECTORY "${output_directory}"
        QT_PLUGIN_TYPE "${plugin_type_escaped}"
        # Save the non-sanitized plugin type values for qmake consumption via .pri files.
-        QT_QMAKE_PLUGIN_TYPE "${arg_TYPE}"
+        QT_QMAKE_PLUGIN_TYPE "${plugin_type}"
    )

    qt_handle_multi_config_output_dirs("${target}")
@ -254,7 +264,7 @@ function(qt_internal_add_plugin target)
    if(TARGET qt_plugins)
        add_dependencies(qt_plugins "${target}")
    endif()
-    if(arg_TYPE STREQUAL "platforms")
+    if(plugin_type STREQUAL "platforms")
        if(TARGET qpa_plugins)
            add_dependencies(qpa_plugins "${target}")
        endif()
--- a/cmake/QtTargetHelpers.cmake
+++ b/cmake/QtTargetHelpers.cmake
@ -248,7 +248,8 @@ endfunction()
 function(qt_internal_check_directory_or_type name dir type default result_var)
    if ("x${dir}" STREQUAL x)
        if("x${type}" STREQUAL x)
-            message(FATAL_ERROR "qt_internal_add_plugin called without setting either TYPE or ${name}.")
+            message(FATAL_ERROR
+                "qt_internal_add_plugin called without setting either PLUGIN_TYPE or ${name}.")
        endif()
        set(${result_var} "${default}" PARENT_SCOPE)
    else()
--- 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()
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/tests/auto/cmake/mockplugins/mock1plugin/CMakeLists.txt
+++ b/tests/auto/cmake/mockplugins/mock1plugin/CMakeLists.txt
@ -1,6 +1,6 @@
 qt_internal_add_plugin(QMock1Plugin
    CLASS_NAME QMock1Plugin
-    TYPE mockplugin
+    PLUGIN_TYPE mockplugin
    SOURCES
        qmock1plugin.cpp qmock1plugin.h
    PUBLIC_LIBRARIES
--- a/tests/auto/cmake/mockplugins/mock2plugin/CMakeLists.txt
+++ b/tests/auto/cmake/mockplugins/mock2plugin/CMakeLists.txt
@ -1,6 +1,6 @@
 qt_internal_add_plugin(QMock2Plugin
    CLASS_NAME QMock2Plugin
-    TYPE mockplugin
+    PLUGIN_TYPE mockplugin
    SOURCES
        qmock2plugin.cpp qmock2plugin.h
    PUBLIC_LIBRARIES
--- a/tests/auto/cmake/mockplugins/mock3plugin/CMakeLists.txt
+++ b/tests/auto/cmake/mockplugins/mock3plugin/CMakeLists.txt
@ -1,6 +1,6 @@
 qt_internal_add_plugin(QMock3Plugin
    CLASS_NAME QMock3Plugin
-    TYPE mockplugin
+    PLUGIN_TYPE mockplugin
    SOURCES
        qmock3plugin.cpp qmock3plugin.h
    PUBLIC_LIBRARIES
--- a/tests/auto/cmake/mockplugins/mock4plugin/CMakeLists.txt
+++ b/tests/auto/cmake/mockplugins/mock4plugin/CMakeLists.txt
@ -1,6 +1,6 @@
 qt_internal_add_plugin(QMock4Plugin
    CLASS_NAME QMock4Plugin
-    TYPE mockplugin
+    PLUGIN_TYPE mockplugin
    DEFAULT_IF FALSE
    SOURCES
        qmock4plugin.cpp qmock4plugin.h
--- a/tests/auto/cmake/mockplugins/mock5plugin/CMakeLists.txt
+++ b/tests/auto/cmake/mockplugins/mock5plugin/CMakeLists.txt
@ -1,6 +1,6 @@
 qt_internal_add_plugin(QMock5Plugin
    CLASS_NAME QMock5Plugin
-    TYPE mockplugin
+    PLUGIN_TYPE mockplugin
    DEFAULT_IF FALSE
    SOURCES
        qmock5plugin.cpp qmock5plugin.h
--- a/tests/auto/cmake/mockplugins/mock6plugin/CMakeLists.txt
+++ b/tests/auto/cmake/mockplugins/mock6plugin/CMakeLists.txt
@ -1,6 +1,6 @@
 qt_internal_add_plugin(QMock6Plugin
    CLASS_NAME QMock6Plugin
-    TYPE mockauxplugin
+    PLUGIN_TYPE mockauxplugin
    SOURCES
        qmock6plugin.cpp qmock6plugin.h
    PUBLIC_LIBRARIES
--- a/tests/auto/cmake/test_static_resources/test_init_resources_static_plugin/CMakeLists.txt
+++ b/tests/auto/cmake/test_static_resources/test_init_resources_static_plugin/CMakeLists.txt
@ -1,7 +1,7 @@
 qt_internal_add_plugin(TestInitResourcesStaticPlugin STATIC
    OUTPUT_NAME
        testinitresourcesstaticplugin
-    TYPE mockstaticresources
+    PLUGIN_TYPE mockstaticresources
    SOURCES
        pluginmain.cpp
    SKIP_INSTALL
--- a/tests/auto/cmake/tst_qaddpreroutine/CMakeLists.txt
+++ b/tests/auto/cmake/tst_qaddpreroutine/CMakeLists.txt
@ -25,7 +25,7 @@ qt_internal_add_plugin(QTBUG_90341ThemePlugin
    OUTPUT_NAME QTBUG_90341
    OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
    CLASS_NAME ThemePlugin
-    TYPE platformthemes
+    PLUGIN_TYPE platformthemes
    DEFAULT_IF TRUE
    SOURCES
        plugin.cpp