CMake: Regenerate qtdeclarative/src

Includes
 - renaming of internal plugin api call
 - generation of QT_QMLTYPES_FILENAME
 - addition of a few TARGET_DESCRIPTION

Change-Id: I72b5647b8c16af9945795ead62a075322b6bb2f6
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

12 files changed, 14 insertions, 12 deletions

diff --git a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
index 7f42437e82..de3f663d09 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QQmlDebuggerServiceFactory Plugin:
 #####################################################################
 
-qt_add_plugin(QQmlDebuggerServiceFactory
+qt_internal_add_plugin(QQmlDebuggerServiceFactory
     OUTPUT_NAME qmldbg_debugger
     TYPE qmltooling
     SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt
index 4e2b41c67b..da79890824 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QQmlInspectorServiceFactory Plugin:
 #####################################################################
 
-qt_add_plugin(QQmlInspectorServiceFactory
+qt_internal_add_plugin(QQmlInspectorServiceFactory
     OUTPUT_NAME qmldbg_inspector
     TYPE qmltooling
     SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
index 32cb329cc2..faeef01111 100644
--- a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QLocalClientConnectionFactory Plugin:
 #####################################################################
 
-qt_add_plugin(QLocalClientConnectionFactory
+qt_internal_add_plugin(QLocalClientConnectionFactory
     OUTPUT_NAME qmldbg_local
     TYPE qmltooling
     SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
index 83bfbe1c37..7785a4c8ed 100644
--- a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QDebugMessageServiceFactory Plugin:
 #####################################################################
 
-qt_add_plugin(QDebugMessageServiceFactory
+qt_internal_add_plugin(QDebugMessageServiceFactory
     OUTPUT_NAME qmldbg_messages
     TYPE qmltooling
     SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt
index 844c35ae4b..37447f593a 100644
--- a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QQmlNativeDebugConnectorFactory Plugin:
 #####################################################################
 
-qt_add_plugin(QQmlNativeDebugConnectorFactory
+qt_internal_add_plugin(QQmlNativeDebugConnectorFactory
     OUTPUT_NAME qmldbg_native
     TYPE qmltooling
     SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt
index 62aa1399e0..b26b66ec6b 100644
--- a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QQmlNativeDebugServiceFactory Plugin:
 #####################################################################
 
-qt_add_plugin(QQmlNativeDebugServiceFactory
+qt_internal_add_plugin(QQmlNativeDebugServiceFactory
     OUTPUT_NAME qmldbg_nativedebugger
     TYPE qmltooling
     SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt
index 908fd961fe..2874580a03 100644
--- a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QQmlPreviewServiceFactory Plugin:
 #####################################################################
 
-qt_add_plugin(QQmlPreviewServiceFactory
+qt_internal_add_plugin(QQmlPreviewServiceFactory
     OUTPUT_NAME qmldbg_preview
     TYPE qmltooling
     SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt
index b1ff256a1a..ac1bf3fe69 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QQmlProfilerServiceFactory Plugin:
 #####################################################################
 
-qt_add_plugin(QQmlProfilerServiceFactory
+qt_internal_add_plugin(QQmlProfilerServiceFactory
     OUTPUT_NAME qmldbg_profiler
     TYPE qmltooling
     SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt
index e67deee569..a7a346eeef 100644
--- a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QQuickProfilerAdapterFactory Plugin:
 #####################################################################
 
-qt_add_plugin(QQuickProfilerAdapterFactory
+qt_internal_add_plugin(QQuickProfilerAdapterFactory
     OUTPUT_NAME qmldbg_quickprofiler
     TYPE qmltooling
     SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt
index 58a8b9506b..490be0be7c 100644
--- a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QQmlDebugServerFactory Plugin:
 #####################################################################
 
-qt_add_plugin(QQmlDebugServerFactory
+qt_internal_add_plugin(QQmlDebugServerFactory
     OUTPUT_NAME qmldbg_server
     TYPE qmltooling
     SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
index 0c9afa852f..5fc079ea4a 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QTcpServerConnectionFactory Plugin:
 #####################################################################
 
-qt_add_plugin(QTcpServerConnectionFactory
+qt_internal_add_plugin(QTcpServerConnectionFactory
     OUTPUT_NAME qmldbg_tcp
     TYPE qmltooling
     SOURCES
diff --git a/src/plugins/scenegraph/openvg/CMakeLists.txt b/src/plugins/scenegraph/openvg/CMakeLists.txt
index 3acfa066f4..a46c66cfaa 100644
--- a/src/plugins/scenegraph/openvg/CMakeLists.txt
+++ b/src/plugins/scenegraph/openvg/CMakeLists.txt
@@ -4,9 +4,11 @@
 ## QSGOpenVGAdaptation Plugin:
 #####################################################################
 
-qt_add_plugin(QSGOpenVGAdaptation
+qt_internal_add_plugin(QSGOpenVGAdaptation
     OUTPUT_NAME qsgopenvgbackend
     TYPE scenegraph
+    TARGET_PRODUCT "Qt Quick OpenVG Renderer (Qt $$QT_VERSION)"
+    TARGET_DESCRIPTION "Quick OpenVG Renderer for Qt."
     SOURCES
         qopenvgcontext.cpp qopenvgcontext_p.h
         qopenvgmatrix.cpp qopenvgmatrix.h