Regenerate qtdeclarative before merge

Change-Id: I5710110679220c4e22bc7f8b540f18a51b735ddf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot

19 files changed, 18 insertions, 5 deletions

diff --git a/src/imports/folderlistmodel/CMakeLists.txt b/src/imports/folderlistmodel/CMakeLists.txt
index 7fba885fd9..d9bb57c950 100644
--- a/src/imports/folderlistmodel/CMakeLists.txt
+++ b/src/imports/folderlistmodel/CMakeLists.txt
@@ -8,6 +8,7 @@ add_qml_module(qmlfolderlistmodelplugin
     URI "Qt.labs.folderlistmodel"
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QmlFolderListModelPlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         fileinfothread.cpp fileinfothread_p.h
         fileproperty_p.h
diff --git a/src/imports/labsanimation/CMakeLists.txt b/src/imports/labsanimation/CMakeLists.txt
index 9e3768ad75..e0b322552e 100644
--- a/src/imports/labsanimation/CMakeLists.txt
+++ b/src/imports/labsanimation/CMakeLists.txt
@@ -8,6 +8,7 @@ add_qml_module(labsanimationplugin
     URI "Qt.labs.animation"
     VERSION "1.0"
     CLASSNAME QtLabsAnimationPlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
     LIBRARIES
diff --git a/src/imports/labsmodels/CMakeLists.txt b/src/imports/labsmodels/CMakeLists.txt
index 84e778843f..268120ffc1 100644
--- a/src/imports/labsmodels/CMakeLists.txt
+++ b/src/imports/labsmodels/CMakeLists.txt
@@ -8,6 +8,7 @@ add_qml_module(labsmodelsplugin
     URI "Qt.labs.qmlmodels"
     VERSION "1.0"
     CLASSNAME QtQmlLabsModelsPlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
     LIBRARIES
diff --git a/src/imports/layouts/CMakeLists.txt b/src/imports/layouts/CMakeLists.txt
index f75ec2eb9a..dbfefb239d 100644
--- a/src/imports/layouts/CMakeLists.txt
+++ b/src/imports/layouts/CMakeLists.txt
@@ -9,6 +9,7 @@ add_qml_module(qquicklayoutsplugin
     VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
     DESIGNER_SUPPORTED
     CLASSNAME QtQuickLayoutsPlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
         qquickgridlayoutengine.cpp qquickgridlayoutengine_p.h
diff --git a/src/imports/localstorage/CMakeLists.txt b/src/imports/localstorage/CMakeLists.txt
index 2727b4dfa0..22ee1b947b 100644
--- a/src/imports/localstorage/CMakeLists.txt
+++ b/src/imports/localstorage/CMakeLists.txt
@@ -8,6 +8,7 @@ add_qml_module(qmllocalstorageplugin
     URI "QtQuick.LocalStorage"
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QQmlLocalStoragePlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
     LIBRARIES
diff --git a/src/imports/models/CMakeLists.txt b/src/imports/models/CMakeLists.txt
index 9b06e998c9..a7affed6e4 100644
--- a/src/imports/models/CMakeLists.txt
+++ b/src/imports/models/CMakeLists.txt
@@ -10,6 +10,7 @@ add_qml_module(modelsplugin
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
     DESIGNER_SUPPORTED
     CLASSNAME QtQmlModelsPlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
     LIBRARIES
diff --git a/src/imports/particles/CMakeLists.txt b/src/imports/particles/CMakeLists.txt
index f519891b49..04fd522837 100644
--- a/src/imports/particles/CMakeLists.txt
+++ b/src/imports/particles/CMakeLists.txt
@@ -9,6 +9,7 @@ add_qml_module(particlesplugin
     URI "QtQuick.Particles"
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QtQuick2ParticlesPlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
     LIBRARIES
diff --git a/src/imports/qtqml/.prev_CMakeLists.txt b/src/imports/qtqml/.prev_CMakeLists.txt
index 5e5be848bd..e8261aa5c7 100644
--- a/src/imports/qtqml/.prev_CMakeLists.txt
+++ b/src/imports/qtqml/.prev_CMakeLists.txt
@@ -12,6 +12,7 @@ add_qml_module(qmlplugin
     IMPORTS
         QtQml.Models
         QtQml.WorkerScript
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
     LIBRARIES
diff --git a/src/imports/qtqml/CMakeLists.txt b/src/imports/qtqml/CMakeLists.txt
index 855be1b62b..185116e6ce 100644
--- a/src/imports/qtqml/CMakeLists.txt
+++ b/src/imports/qtqml/CMakeLists.txt
@@ -12,6 +12,7 @@ add_qml_module(qmlplugin
     IMPORTS
         QtQml.Models
         QtQml.WorkerScript
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
     LIBRARIES
diff --git a/src/imports/qtquick2/CMakeLists.txt b/src/imports/qtquick2/CMakeLists.txt
index f9026d5774..f40864b8e0 100644
--- a/src/imports/qtquick2/CMakeLists.txt
+++ b/src/imports/qtquick2/CMakeLists.txt
@@ -12,6 +12,7 @@ add_qml_module(qtquick2plugin
     CLASSNAME QtQuick2Plugin
     IMPORTS
         QtQml
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
     LIBRARIES
diff --git a/src/imports/settings/CMakeLists.txt b/src/imports/settings/CMakeLists.txt
index f90b1a1040..57ab9efa89 100644
--- a/src/imports/settings/CMakeLists.txt
+++ b/src/imports/settings/CMakeLists.txt
@@ -8,6 +8,7 @@ add_qml_module(qmlsettingsplugin
     URI "Qt.labs.settings"
     VERSION "1.1"
     CLASSNAME QmlSettingsPlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
         qqmlsettings.cpp qqmlsettings_p.h
diff --git a/src/imports/shapes/CMakeLists.txt b/src/imports/shapes/CMakeLists.txt
index 9274fd14e7..c91c246ace 100644
--- a/src/imports/shapes/CMakeLists.txt
+++ b/src/imports/shapes/CMakeLists.txt
@@ -8,6 +8,7 @@ add_qml_module(qmlshapesplugin
     URI "QtQuick.Shapes"
     VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QmlShapesPlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
     LIBRARIES
diff --git a/src/imports/sharedimage/CMakeLists.txt b/src/imports/sharedimage/CMakeLists.txt
index 266faa6dc5..6dbf8f8ab7 100644
--- a/src/imports/sharedimage/CMakeLists.txt
+++ b/src/imports/sharedimage/CMakeLists.txt
@@ -8,6 +8,7 @@ add_qml_module(sharedimageplugin
     URI "Qt.labs.sharedimage"
     VERSION "1.0"
     CLASSNAME QtQuickSharedImagePlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
         qsharedimageloader.cpp qsharedimageloader_p.h
diff --git a/src/imports/statemachine/CMakeLists.txt b/src/imports/statemachine/CMakeLists.txt
index 245c4aa681..f06fed1765 100644
--- a/src/imports/statemachine/CMakeLists.txt
+++ b/src/imports/statemachine/CMakeLists.txt
@@ -8,6 +8,7 @@ add_qml_module(qtqmlstatemachine
     URI "QtQml.StateMachine"
     VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QtQmlStateMachinePlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         childrenprivate.h
         finalstate.cpp finalstate.h
diff --git a/src/imports/testlib/.prev_CMakeLists.txt b/src/imports/testlib/.prev_CMakeLists.txt
index 7674568e16..17cfcc34ec 100644
--- a/src/imports/testlib/.prev_CMakeLists.txt
+++ b/src/imports/testlib/.prev_CMakeLists.txt
@@ -39,12 +39,10 @@ set(qml_files
     "testlogger.js"
 )
 set_source_files_properties(TestCase.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "1.2"
-    QT_QML_SOURCE_INSTALL TRUE
+    QT_QML_SOURCE_VERSION "1.0"
 )
 set_source_files_properties(SignalSpy.qml PROPERTIES
     QT_QML_SOURCE_VERSION "1.0"
-    QT_QML_SOURCE_INSTALL TRUE
 )
 
 qt6_target_qml_files(qmltestplugin
diff --git a/src/imports/testlib/CMakeLists.txt b/src/imports/testlib/CMakeLists.txt
index d5b5e821d8..b72e907fcb 100644
--- a/src/imports/testlib/CMakeLists.txt
+++ b/src/imports/testlib/CMakeLists.txt
@@ -40,11 +40,9 @@ set(qml_files
 )
 set_source_files_properties(TestCase.qml PROPERTIES
     QT_QML_SOURCE_VERSION "1.0"
-    QT_QML_SOURCE_INSTALL TRUE
 )
 set_source_files_properties(SignalSpy.qml PROPERTIES
     QT_QML_SOURCE_VERSION "1.0"
-    QT_QML_SOURCE_INSTALL TRUE
 )
 # special case begin
 set_source_files_properties(testlogger.js PROPERTIES
diff --git a/src/imports/wavefrontmesh/CMakeLists.txt b/src/imports/wavefrontmesh/CMakeLists.txt
index 8700cf9343..41a88305c7 100644
--- a/src/imports/wavefrontmesh/CMakeLists.txt
+++ b/src/imports/wavefrontmesh/CMakeLists.txt
@@ -8,6 +8,7 @@ add_qml_module(qmlwavefrontmeshplugin
     URI "Qt.labs.wavefrontmesh"
     VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QmlWavefrontMeshPlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
         qwavefrontmesh.cpp qwavefrontmesh.h
diff --git a/src/imports/window/CMakeLists.txt b/src/imports/window/CMakeLists.txt
index 3c42234360..9301f86038 100644
--- a/src/imports/window/CMakeLists.txt
+++ b/src/imports/window/CMakeLists.txt
@@ -10,6 +10,7 @@ add_qml_module(windowplugin
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
     DESIGNER_SUPPORTED
     CLASSNAME QtQuick2WindowPlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
     LIBRARIES
diff --git a/src/imports/workerscript/CMakeLists.txt b/src/imports/workerscript/CMakeLists.txt
index c17b76edc6..ae0da6de0c 100644
--- a/src/imports/workerscript/CMakeLists.txt
+++ b/src/imports/workerscript/CMakeLists.txt
@@ -10,6 +10,7 @@ add_qml_module(workerscriptplugin
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
     DESIGNER_SUPPORTED
     CLASSNAME QtQmlWorkerScriptPlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
     LIBRARIES