CMake: Rename qt plugin targets to end with Plugin

So that CMake automatically calls find_package for each of those
plugins when the module they belong to is find_package()d.

Change-Id: I0c9badc29227e60bbe344de3b2c5fbe887dab3e2
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 6c243002092feaeb179fb2bc48de0a8865bbf58d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

12 files changed, 29 insertions, 17 deletions

diff --git a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
index de3f663d09..f02e58a39e 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
@@ -4,8 +4,9 @@
 ## QQmlDebuggerServiceFactory Plugin:
 #####################################################################
 
-qt_internal_add_plugin(QQmlDebuggerServiceFactory
+qt_internal_add_plugin(QQmlDebuggerServiceFactoryPlugin
     OUTPUT_NAME qmldbg_debugger
+    CLASS_NAME QQmlDebuggerServiceFactory
     TYPE qmltooling
     SOURCES
         qqmldebuggerservicefactory.cpp qqmldebuggerservicefactory.h
diff --git a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt
index da79890824..db042df4f4 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt
@@ -4,8 +4,9 @@
 ## QQmlInspectorServiceFactory Plugin:
 #####################################################################
 
-qt_internal_add_plugin(QQmlInspectorServiceFactory
+qt_internal_add_plugin(QQmlInspectorServiceFactoryPlugin
     OUTPUT_NAME qmldbg_inspector
+    CLASS_NAME QQmlInspectorServiceFactory
     TYPE qmltooling
     SOURCES
         globalinspector.cpp globalinspector.h
diff --git a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
index faeef01111..aabce3de14 100644
--- a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
@@ -4,8 +4,9 @@
 ## QLocalClientConnectionFactory Plugin:
 #####################################################################
 
-qt_internal_add_plugin(QLocalClientConnectionFactory
+qt_internal_add_plugin(QLocalClientConnectionFactoryPlugin
     OUTPUT_NAME qmldbg_local
+    CLASS_NAME QLocalClientConnectionFactory
     TYPE qmltooling
     SOURCES
         qlocalclientconnection.cpp
diff --git a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
index 7785a4c8ed..0359990795 100644
--- a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
@@ -4,8 +4,9 @@
 ## QDebugMessageServiceFactory Plugin:
 #####################################################################
 
-qt_internal_add_plugin(QDebugMessageServiceFactory
+qt_internal_add_plugin(QDebugMessageServiceFactoryPlugin
     OUTPUT_NAME qmldbg_messages
+    CLASS_NAME QDebugMessageServiceFactory
     TYPE qmltooling
     SOURCES
         qdebugmessageservice.cpp qdebugmessageservice.h
diff --git a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt
index 37447f593a..9c71c93be1 100644
--- a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt
@@ -4,8 +4,9 @@
 ## QQmlNativeDebugConnectorFactory Plugin:
 #####################################################################
 
-qt_internal_add_plugin(QQmlNativeDebugConnectorFactory
+qt_internal_add_plugin(QQmlNativeDebugConnectorFactoryPlugin
     OUTPUT_NAME qmldbg_native
+    CLASS_NAME QQmlNativeDebugConnectorFactory
     TYPE qmltooling
     SOURCES
         qqmlnativedebugconnector.cpp qqmlnativedebugconnector.h
diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt
index b26b66ec6b..c11185b736 100644
--- a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt
@@ -4,8 +4,9 @@
 ## QQmlNativeDebugServiceFactory Plugin:
 #####################################################################
 
-qt_internal_add_plugin(QQmlNativeDebugServiceFactory
+qt_internal_add_plugin(QQmlNativeDebugServiceFactoryPlugin
     OUTPUT_NAME qmldbg_nativedebugger
+    CLASS_NAME QQmlNativeDebugServiceFactory
     TYPE qmltooling
     SOURCES
         qqmlnativedebugservice.cpp qqmlnativedebugservice.h
diff --git a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt
index 2b3611b90d..55da4117a4 100644
--- a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt
@@ -4,8 +4,9 @@
 ## QQmlPreviewServiceFactory Plugin:
 #####################################################################
 
-qt_internal_add_plugin(QQmlPreviewServiceFactory
+qt_internal_add_plugin(QQmlPreviewServiceFactoryPlugin
     OUTPUT_NAME qmldbg_preview
+    CLASS_NAME QQmlPreviewServiceFactory
     TYPE qmltooling
     SOURCES
         qqmlpreviewblacklist.cpp qqmlpreviewblacklist.h
@@ -29,7 +30,7 @@ qt_internal_add_plugin(QQmlPreviewServiceFactory
 #### Keys ignored in scope 1:.:.:qmldbg_preview.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/qqmlpreviewservice.json"
 
-qt_internal_extend_target(QQmlPreviewServiceFactory CONDITION QT_FEATURE_translation
+qt_internal_extend_target(QQmlPreviewServiceFactoryPlugin CONDITION QT_FEATURE_translation
     SOURCES
         proxytranslator.cpp proxytranslator.h
         qqmldebugtranslationservice.cpp qqmldebugtranslationservice.h
diff --git a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt
index ac1bf3fe69..3559e045a6 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt
@@ -4,8 +4,9 @@
 ## QQmlProfilerServiceFactory Plugin:
 #####################################################################
 
-qt_internal_add_plugin(QQmlProfilerServiceFactory
+qt_internal_add_plugin(QQmlProfilerServiceFactoryPlugin
     OUTPUT_NAME qmldbg_profiler
+    CLASS_NAME QQmlProfilerServiceFactory
     TYPE qmltooling
     SOURCES
         qqmlenginecontrolservice.cpp qqmlenginecontrolservice.h
diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt
index a7a346eeef..c79ed0fa59 100644
--- a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt
@@ -4,8 +4,9 @@
 ## QQuickProfilerAdapterFactory Plugin:
 #####################################################################
 
-qt_internal_add_plugin(QQuickProfilerAdapterFactory
+qt_internal_add_plugin(QQuickProfilerAdapterFactoryPlugin
     OUTPUT_NAME qmldbg_quickprofiler
+    CLASS_NAME QQuickProfilerAdapterFactory
     TYPE qmltooling
     SOURCES
         qquickprofileradapter.cpp qquickprofileradapter.h
diff --git a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt
index 490be0be7c..d27a11bdde 100644
--- a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt
@@ -4,8 +4,9 @@
 ## QQmlDebugServerFactory Plugin:
 #####################################################################
 
-qt_internal_add_plugin(QQmlDebugServerFactory
+qt_internal_add_plugin(QQmlDebugServerFactoryPlugin
     OUTPUT_NAME qmldbg_server
+    CLASS_NAME QQmlDebugServerFactory
     TYPE qmltooling
     SOURCES
         qqmldebugserver.cpp
diff --git a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
index 5fc079ea4a..0c556577f2 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
@@ -4,8 +4,9 @@
 ## QTcpServerConnectionFactory Plugin:
 #####################################################################
 
-qt_internal_add_plugin(QTcpServerConnectionFactory
+qt_internal_add_plugin(QTcpServerConnectionFactoryPlugin
     OUTPUT_NAME qmldbg_tcp
+    CLASS_NAME QTcpServerConnectionFactory
     TYPE qmltooling
     SOURCES
         qtcpserverconnection.cpp
diff --git a/src/plugins/scenegraph/openvg/CMakeLists.txt b/src/plugins/scenegraph/openvg/CMakeLists.txt
index 8be9b4fad3..07cea45827 100644
--- a/src/plugins/scenegraph/openvg/CMakeLists.txt
+++ b/src/plugins/scenegraph/openvg/CMakeLists.txt
@@ -4,8 +4,9 @@
 ## QSGOpenVGAdaptation Plugin:
 #####################################################################
 
-qt_internal_add_plugin(QSGOpenVGAdaptation
+qt_internal_add_plugin(QSGOpenVGAdaptationPlugin
     OUTPUT_NAME qsgopenvgbackend
+    CLASS_NAME QSGOpenVGAdaptation
     TYPE scenegraph
     TARGET_PRODUCT "Qt Quick OpenVG Renderer (Qt $$QT_VERSION)"
     TARGET_DESCRIPTION "Quick OpenVG Renderer for Qt."
@@ -46,22 +47,22 @@ qt_internal_add_plugin(QSGOpenVGAdaptation
 ## Scopes:
 #####################################################################
 
-qt_internal_extend_target(QSGOpenVGAdaptation CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND debug_and_release
+qt_internal_extend_target(QSGOpenVGAdaptationPlugin CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND debug_and_release
     INCLUDE_DIRECTORIES
         ${CMAKE_CURRENT_BINARY_DIR}/../../../quick/.tracegen/debug
 )
 
-qt_internal_extend_target(QSGOpenVGAdaptation CONDITION debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug
+qt_internal_extend_target(QSGOpenVGAdaptationPlugin CONDITION debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug
     INCLUDE_DIRECTORIES
         ${CMAKE_CURRENT_BINARY_DIR}/../../../quick/.tracegen/release
 )
 
-qt_internal_extend_target(QSGOpenVGAdaptation CONDITION NOT debug_and_release
+qt_internal_extend_target(QSGOpenVGAdaptationPlugin CONDITION NOT debug_and_release
     INCLUDE_DIRECTORIES
         ${CMAKE_CURRENT_BINARY_DIR}/../../../quick/.tracegen
 )
 
-qt_internal_extend_target(QSGOpenVGAdaptation CONDITION QT_FEATURE_quick_sprite
+qt_internal_extend_target(QSGOpenVGAdaptationPlugin CONDITION QT_FEATURE_quick_sprite
     SOURCES
         qsgopenvgspritenode.cpp qsgopenvgspritenode.h
 )