CMake: Use renamed qt6_add_plugin PLUGIN_TYPE option

Task-number: QTBUG-95170
Pick-to: 6.2
Change-Id: I6126387bcfc8c93211d782edd9fc127fba88f66f
Reviewed-by: Kai Koehne <kai.koehne@qt.io>

15 files changed, 15 insertions, 15 deletions

diff --git a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
index bfe9f06d98..67e408e8aa 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
@@ -7,7 +7,7 @@
 qt_internal_add_plugin(QQmlDebuggerServiceFactoryPlugin
     OUTPUT_NAME qmldbg_debugger
     CLASS_NAME QQmlDebuggerServiceFactory
-    TYPE qmltooling
+    PLUGIN_TYPE qmltooling
     SOURCES
         qqmldebuggerservicefactory.cpp qqmldebuggerservicefactory.h
         qqmlenginedebugservice.cpp qqmlenginedebugservice.h
diff --git a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt
index 968435f27b..40eee66b2e 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt
@@ -7,7 +7,7 @@
 qt_internal_add_plugin(QQmlInspectorServiceFactoryPlugin
     OUTPUT_NAME qmldbg_inspector
     CLASS_NAME QQmlInspectorServiceFactory
-    TYPE qmltooling
+    PLUGIN_TYPE qmltooling
     SOURCES
         globalinspector.cpp globalinspector.h
         highlight.cpp highlight.h
diff --git a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
index 485f00df3b..82fb91d423 100644
--- a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
@@ -7,7 +7,7 @@
 qt_internal_add_plugin(QLocalClientConnectionFactoryPlugin
     OUTPUT_NAME qmldbg_local
     CLASS_NAME QLocalClientConnectionFactory
-    TYPE qmltooling
+    PLUGIN_TYPE qmltooling
     SOURCES
         qlocalclientconnection.cpp
         qlocalclientconnectionfactory.h
diff --git a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
index 428ea21ccd..9587709f1d 100644
--- a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
@@ -7,7 +7,7 @@
 qt_internal_add_plugin(QDebugMessageServiceFactoryPlugin
     OUTPUT_NAME qmldbg_messages
     CLASS_NAME QDebugMessageServiceFactory
-    TYPE qmltooling
+    PLUGIN_TYPE qmltooling
     SOURCES
         qdebugmessageservice.cpp qdebugmessageservice.h
         qdebugmessageservicefactory.cpp qdebugmessageservicefactory.h
diff --git a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt
index 1bb2ed9e39..1e300ba807 100644
--- a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt
@@ -7,7 +7,7 @@
 qt_internal_add_plugin(QQmlNativeDebugConnectorFactoryPlugin
     OUTPUT_NAME qmldbg_native
     CLASS_NAME QQmlNativeDebugConnectorFactory
-    TYPE qmltooling
+    PLUGIN_TYPE qmltooling
     SOURCES
         qqmlnativedebugconnector.cpp qqmlnativedebugconnector.h
     LIBRARIES
diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt
index 25d54236fd..ccfcd7e183 100644
--- a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt
@@ -7,7 +7,7 @@
 qt_internal_add_plugin(QQmlNativeDebugServiceFactoryPlugin
     OUTPUT_NAME qmldbg_nativedebugger
     CLASS_NAME QQmlNativeDebugServiceFactory
-    TYPE qmltooling
+    PLUGIN_TYPE qmltooling
     SOURCES
         qqmlnativedebugservice.cpp qqmlnativedebugservice.h
         qqmlnativedebugservicefactory.cpp qqmlnativedebugservicefactory.h
diff --git a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt
index f12d622716..0c514ea6c3 100644
--- a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt
@@ -7,7 +7,7 @@
 qt_internal_add_plugin(QQmlPreviewServiceFactoryPlugin
     OUTPUT_NAME qmldbg_preview
     CLASS_NAME QQmlPreviewServiceFactory
-    TYPE qmltooling
+    PLUGIN_TYPE qmltooling
     SOURCES
         qqmlpreviewblacklist.cpp qqmlpreviewblacklist.h
         qqmlpreviewfileengine.cpp qqmlpreviewfileengine.h
diff --git a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt
index 823a94493c..b18c9f7c1a 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt
@@ -7,7 +7,7 @@
 qt_internal_add_plugin(QQmlProfilerServiceFactoryPlugin
     OUTPUT_NAME qmldbg_profiler
     CLASS_NAME QQmlProfilerServiceFactory
-    TYPE qmltooling
+    PLUGIN_TYPE qmltooling
     SOURCES
         qqmlenginecontrolservice.cpp qqmlenginecontrolservice.h
         qqmlprofileradapter.cpp qqmlprofileradapter.h
diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt
index 529f0eaecc..5b38060052 100644
--- a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt
@@ -7,7 +7,7 @@
 qt_internal_add_plugin(QQuickProfilerAdapterFactoryPlugin
     OUTPUT_NAME qmldbg_quickprofiler
     CLASS_NAME QQuickProfilerAdapterFactory
-    TYPE qmltooling
+    PLUGIN_TYPE qmltooling
     SOURCES
         qquickprofileradapter.cpp qquickprofileradapter.h
         qquickprofileradapterfactory.cpp qquickprofileradapterfactory.h
diff --git a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt
index 7795b3acc2..3e809d8210 100644
--- a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt
@@ -7,7 +7,7 @@
 qt_internal_add_plugin(QQmlDebugServerFactoryPlugin
     OUTPUT_NAME qmldbg_server
     CLASS_NAME QQmlDebugServerFactory
-    TYPE qmltooling
+    PLUGIN_TYPE qmltooling
     SOURCES
         qqmldebugserver.cpp
         qqmldebugserverfactory.h
diff --git a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
index c9e07a4912..aaed477b60 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
@@ -7,7 +7,7 @@
 qt_internal_add_plugin(QTcpServerConnectionFactoryPlugin
     OUTPUT_NAME qmldbg_tcp
     CLASS_NAME QTcpServerConnectionFactory
-    TYPE qmltooling
+    PLUGIN_TYPE qmltooling
     SOURCES
         qtcpserverconnection.cpp
         qtcpserverconnectionfactory.h
diff --git a/src/plugins/scenegraph/openvg/CMakeLists.txt b/src/plugins/scenegraph/openvg/CMakeLists.txt
index 07cea45827..da1cb42656 100644
--- a/src/plugins/scenegraph/openvg/CMakeLists.txt
+++ b/src/plugins/scenegraph/openvg/CMakeLists.txt
@@ -7,7 +7,7 @@
 qt_internal_add_plugin(QSGOpenVGAdaptationPlugin
     OUTPUT_NAME qsgopenvgbackend
     CLASS_NAME QSGOpenVGAdaptation
-    TYPE scenegraph
+    PLUGIN_TYPE scenegraph
     TARGET_PRODUCT "Qt Quick OpenVG Renderer (Qt $$QT_VERSION)"
     TARGET_DESCRIPTION "Quick OpenVG Renderer for Qt."
     SOURCES
diff --git a/src/qml/Qt6QmlBuildInternals.cmake b/src/qml/Qt6QmlBuildInternals.cmake
index edc264ad76..e33f59bb95 100644
--- a/src/qml/Qt6QmlBuildInternals.cmake
+++ b/src/qml/Qt6QmlBuildInternals.cmake
@@ -208,7 +208,7 @@ function(qt_internal_add_qml_module target)
 
         # Create plugin target now so we can set internal things
         list(APPEND plugin_args
-            TYPE qml_plugin
+            PLUGIN_TYPE qml_plugin
             DEFAULT_IF FALSE
             OUTPUT_DIRECTORY ${arg_OUTPUT_DIRECTORY}
             INSTALL_DIRECTORY ${arg_INSTALL_DIRECTORY}
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake
index 9718abf18b..2aa05145ec 100644
--- a/src/qml/Qt6QmlMacros.cmake
+++ b/src/qml/Qt6QmlMacros.cmake
@@ -935,7 +935,7 @@ function(qt6_add_qml_plugin target)
         endif()
 
         qt6_add_plugin(${target} ${lib_type}
-            TYPE qml_plugin
+            PLUGIN_TYPE qml_plugin
             CLASS_NAME ${arg_CLASS_NAME}
         )
     endif()
diff --git a/tests/auto/qml/qmlbasicapp/BasicExtension/CMakeLists.txt b/tests/auto/qml/qmlbasicapp/BasicExtension/CMakeLists.txt
index 6aad55abdc..14384512c5 100644
--- a/tests/auto/qml/qmlbasicapp/BasicExtension/CMakeLists.txt
+++ b/tests/auto/qml/qmlbasicapp/BasicExtension/CMakeLists.txt
@@ -1,7 +1,7 @@
 qt_add_library(additional_qml_module STATIC)
 qt_autogen_tools_initial_setup(additional_qml_module)
 
-qt_add_plugin(additional_qml_module_plugin STATIC TYPE qml_plugin CLASS_NAME BasicExtension)
+qt_add_plugin(additional_qml_module_plugin STATIC PLUGIN_TYPE qml_plugin CLASS_NAME BasicExtension)
 qt_autogen_tools_initial_setup(additional_qml_module_plugin)
 
 qt6_add_qml_module(additional_qml_module