Regenerate plugins names

Change-Id: I3e1974f383974787bbfc95e06311c173fb06efdc
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

13 files changed, 79 insertions, 40 deletions

diff --git a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
index dc58cf3b30..cc80b2c56d 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from qmldbg_debugger.pro.
 
 #####################################################################
-## qmldbg_debugger Plugin:
+## QQmlDebuggerServiceFactory Plugin:
 #####################################################################
 
-qt_add_plugin(qmldbg_debugger
+qt_add_plugin(QQmlDebuggerServiceFactory
+    OUTPUT_NAME qmldbg_debugger
     TYPE qmltooling
-    CLASS_NAME QQmlDebuggerServiceFactory
     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 213901c75a..648921fd8e 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from qmldbg_inspector.pro.
 
 #####################################################################
-## qmldbg_inspector Plugin:
+## QQmlInspectorServiceFactory Plugin:
 #####################################################################
 
-qt_add_plugin(qmldbg_inspector
+qt_add_plugin(QQmlInspectorServiceFactory
+    OUTPUT_NAME qmldbg_inspector
     TYPE qmltooling
-    CLASS_NAME QQmlInspectorServiceFactory
     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 e97c37cc62..ad285abba9 100644
--- a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from qmldbg_local.pro.
 
 #####################################################################
-## qmldbg_local Plugin:
+## QLocalClientConnectionFactory Plugin:
 #####################################################################
 
-qt_add_plugin(qmldbg_local
+qt_add_plugin(QLocalClientConnectionFactory
+    OUTPUT_NAME qmldbg_local
     TYPE qmltooling
-    CLASS_NAME QLocalClientConnectionFactory
     SOURCES
         qlocalclientconnection.cpp
         qlocalclientconnectionfactory.h
diff --git a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
index 002c575539..980c158488 100644
--- a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from qmldbg_messages.pro.
 
 #####################################################################
-## qmldbg_messages Plugin:
+## QDebugMessageServiceFactory Plugin:
 #####################################################################
 
-qt_add_plugin(qmldbg_messages
+qt_add_plugin(QDebugMessageServiceFactory
+    OUTPUT_NAME qmldbg_messages
     TYPE qmltooling
-    CLASS_NAME QDebugMessageServiceFactory
     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 bcea497c95..ff92255720 100644
--- a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from qmldbg_native.pro.
 
 #####################################################################
-## qmldbg_native Plugin:
+## QQmlNativeDebugConnectorFactory Plugin:
 #####################################################################
 
-qt_add_plugin(qmldbg_native
+qt_add_plugin(QQmlNativeDebugConnectorFactory
+    OUTPUT_NAME qmldbg_native
     TYPE qmltooling
-    CLASS_NAME QQmlNativeDebugConnectorFactory
     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 16396c3c97..6a7e23301f 100644
--- a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from qmldbg_nativedebugger.pro.
 
 #####################################################################
-## qmldbg_nativedebugger Plugin:
+## QQmlNativeDebugServiceFactory Plugin:
 #####################################################################
 
-qt_add_plugin(qmldbg_nativedebugger
+qt_add_plugin(QQmlNativeDebugServiceFactory
+    OUTPUT_NAME qmldbg_nativedebugger
     TYPE qmltooling
-    CLASS_NAME QQmlNativeDebugServiceFactory
     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 02afaa3155..17df4c0b2c 100644
--- a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from qmldbg_preview.pro.
 
 #####################################################################
-## qmldbg_preview Plugin:
+## QQmlPreviewServiceFactory Plugin:
 #####################################################################
 
-qt_add_plugin(qmldbg_preview
+qt_add_plugin(QQmlPreviewServiceFactory
+    OUTPUT_NAME qmldbg_preview
     TYPE qmltooling
-    CLASS_NAME QQmlPreviewServiceFactory
     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 3868e5c68d..1809f3a0d1 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from qmldbg_profiler.pro.
 
 #####################################################################
-## qmldbg_profiler Plugin:
+## QQmlProfilerServiceFactory Plugin:
 #####################################################################
 
-qt_add_plugin(qmldbg_profiler
+qt_add_plugin(QQmlProfilerServiceFactory
+    OUTPUT_NAME qmldbg_profiler
     TYPE qmltooling
-    CLASS_NAME QQmlProfilerServiceFactory
     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 4931efb960..e5afbec3ed 100644
--- a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from qmldbg_quickprofiler.pro.
 
 #####################################################################
-## qmldbg_quickprofiler Plugin:
+## QQuickProfilerAdapterFactory Plugin:
 #####################################################################
 
-qt_add_plugin(qmldbg_quickprofiler
+qt_add_plugin(QQuickProfilerAdapterFactory
+    OUTPUT_NAME qmldbg_quickprofiler
     TYPE qmltooling
-    CLASS_NAME QQuickProfilerAdapterFactory
     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 312302f193..c6e1ccd915 100644
--- a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from qmldbg_server.pro.
 
 #####################################################################
-## qmldbg_server Plugin:
+## QQmlDebugServerFactory Plugin:
 #####################################################################
 
-qt_add_plugin(qmldbg_server
+qt_add_plugin(QQmlDebugServerFactory
+    OUTPUT_NAME qmldbg_server
     TYPE qmltooling
-    CLASS_NAME QQmlDebugServerFactory
     SOURCES
         qqmldebugserver.cpp
         qqmldebugserverfactory.h
diff --git a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
index 0b7a1cc981..fb8397d914 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from qmldbg_tcp.pro.
 
 #####################################################################
-## qmldbg_tcp Plugin:
+## QTcpServerConnectionFactory Plugin:
 #####################################################################
 
-qt_add_plugin(qmldbg_tcp
+qt_add_plugin(QTcpServerConnectionFactory
+    OUTPUT_NAME qmldbg_tcp
     TYPE qmltooling
-    CLASS_NAME QTcpServerConnectionFactory
     SOURCES
         qtcpserverconnection.cpp
         qtcpserverconnectionfactory.h
diff --git a/src/plugins/scenegraph/openvg/CMakeLists.txt b/src/plugins/scenegraph/openvg/CMakeLists.txt
index 8dc29199a9..eb06ef075d 100644
--- a/src/plugins/scenegraph/openvg/CMakeLists.txt
+++ b/src/plugins/scenegraph/openvg/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from openvg.pro.
 
 #####################################################################
-## qsgopenvgbackend Plugin:
+## QSGOpenVGAdaptation Plugin:
 #####################################################################
 
-qt_add_plugin(qsgopenvgbackend
+qt_add_plugin(QSGOpenVGAdaptation
+    OUTPUT_NAME qsgopenvgbackend
     TYPE scenegraph
-    CLASS_NAME QSGOpenVGAdaptation
     SOURCES
         qopenvgcontext.cpp qopenvgcontext_p.h
         qopenvgmatrix.cpp qopenvgmatrix.h
@@ -47,22 +47,22 @@ qt_add_plugin(qsgopenvgbackend
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qsgopenvgbackend CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND debug_and_release
+qt_extend_target(QSGOpenVGAdaptation CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND debug_and_release
     INCLUDE_DIRECTORIES
         ${CMAKE_CURRENT_BINARY_DIR}/../../../quick/.tracegen/debug
 )
 
-qt_extend_target(qsgopenvgbackend CONDITION debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug
+qt_extend_target(QSGOpenVGAdaptation CONDITION debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug
     INCLUDE_DIRECTORIES
         ${CMAKE_CURRENT_BINARY_DIR}/../../../quick/.tracegen/release
 )
 
-qt_extend_target(qsgopenvgbackend CONDITION NOT debug_and_release
+qt_extend_target(QSGOpenVGAdaptation CONDITION NOT debug_and_release
     INCLUDE_DIRECTORIES
         ${CMAKE_CURRENT_BINARY_DIR}/../../../quick/.tracegen
 )
 
-qt_extend_target(qsgopenvgbackend CONDITION QT_FEATURE_quick_sprite
+qt_extend_target(QSGOpenVGAdaptation CONDITION QT_FEATURE_quick_sprite
     SOURCES
         qsgopenvgspritenode.cpp qsgopenvgspritenode.h
 )
diff --git a/src/qmltyperegistrar/.prev_CMakeLists.txt b/src/qmltyperegistrar/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..b9683257bc
--- /dev/null
+++ b/src/qmltyperegistrar/.prev_CMakeLists.txt
@@ -0,0 +1,39 @@
+# Generated from qmltyperegistrar.pro.
+
+#####################################################################
+## qmltyperegistrar Tool:
+#####################################################################
+
+qt_add_tool(qmltyperegistrar
+    SOURCES
+        ../../tools/shared/qmlstreamwriter.cpp ../../tools/shared/qmlstreamwriter.h
+        ../../tools/shared/resourcefilemapper.cpp ../../tools/shared/resourcefilemapper.h
+        qmltyperegistrar.cpp
+        qmltypesclassdescription.cpp qmltypesclassdescription.h
+        qmltypescreator.cpp qmltypescreator.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    INCLUDE_DIRECTORIES
+        ../../tools/shared
+    LIBRARIES
+        Qt::CorePrivate
+)
+
+#### Keys ignored in scope 1:.:.:qmltyperegistrar.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "QML" "Types" "Registrar"
+# _OPTION = "host_build"
+# build_integration.files = "qmltypes.prf"
+# build_integration.path = "$$[QT_HOST_DATA]/mkspecs/features"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:qmltyperegistrar.pro:prefix_build:
+# COPIES = "qmltypes_to_builddir"
+# INSTALLS = "build_integration"
+# qmltypes_to_builddir.files = "qmltypes.prf"
+# qmltypes_to_builddir.path = "$$MODULE_BASE_OUTDIR/mkspecs/features"
+
+#### Keys ignored in scope 3:.:.:qmltyperegistrar.pro:else:
+# COPIES = "build_integration"