QML Type Registrar changes

Change-Id: I36254a688f575e6c7f717ee4019e4d49f73a60f7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

22 files changed, 104 insertions, 3 deletions

diff --git a/src/imports/folderlistmodel/CMakeLists.txt b/src/imports/folderlistmodel/CMakeLists.txt
index 849c317ece..56f953d6bc 100644
--- a/src/imports/folderlistmodel/CMakeLists.txt
+++ b/src/imports/folderlistmodel/CMakeLists.txt
@@ -9,6 +9,7 @@ qt_add_qml_module(qmlfolderlistmodelplugin
     VERSION "2.15"
     CLASSNAME QmlFolderListModelPlugin
     SKIP_TYPE_REGISTRATION
+    GENERATE_QMLTYPES
     SOURCES
         fileinfothread.cpp fileinfothread_p.h
         fileproperty_p.h
diff --git a/src/imports/labsanimation/CMakeLists.txt b/src/imports/labsanimation/CMakeLists.txt
index 8637496097..f9665cfb27 100644
--- a/src/imports/labsanimation/CMakeLists.txt
+++ b/src/imports/labsanimation/CMakeLists.txt
@@ -9,6 +9,7 @@ qt_add_qml_module(labsanimationplugin
     VERSION "1.0"
     CLASSNAME QtLabsAnimationPlugin
     SKIP_TYPE_REGISTRATION
+    GENERATE_QMLTYPES
     SOURCES
         plugin.cpp
         qquickboundaryrule.cpp qquickboundaryrule_p.h
diff --git a/src/imports/labsmodels/CMakeLists.txt b/src/imports/labsmodels/CMakeLists.txt
index d72eb4bedd..06c8a020d7 100644
--- a/src/imports/labsmodels/CMakeLists.txt
+++ b/src/imports/labsmodels/CMakeLists.txt
@@ -9,6 +9,7 @@ qt_add_qml_module(labsmodelsplugin
     VERSION "1.0"
     CLASSNAME QtQmlLabsModelsPlugin
     SKIP_TYPE_REGISTRATION
+    GENERATE_QMLTYPES
     SOURCES
         plugin.cpp
     LIBRARIES
diff --git a/src/imports/layouts/CMakeLists.txt b/src/imports/layouts/CMakeLists.txt
index a3a6f83463..43637d3d0b 100644
--- a/src/imports/layouts/CMakeLists.txt
+++ b/src/imports/layouts/CMakeLists.txt
@@ -10,6 +10,7 @@ qt_add_qml_module(qquicklayoutsplugin
     DESIGNER_SUPPORTED
     CLASSNAME QtQuickLayoutsPlugin
     SKIP_TYPE_REGISTRATION
+    GENERATE_QMLTYPES
     SOURCES
         plugin.cpp
         qquickgridlayoutengine.cpp qquickgridlayoutengine_p.h
diff --git a/src/imports/localstorage/CMakeLists.txt b/src/imports/localstorage/CMakeLists.txt
index 3e711d67d3..cc980eb5e0 100644
--- a/src/imports/localstorage/CMakeLists.txt
+++ b/src/imports/localstorage/CMakeLists.txt
@@ -9,6 +9,7 @@ qt_add_qml_module(qmllocalstorageplugin
     VERSION "2.15"
     CLASSNAME QQmlLocalStoragePlugin
     SKIP_TYPE_REGISTRATION
+    GENERATE_QMLTYPES
     SOURCES
         plugin.cpp
         qquicklocalstorage.cpp qquicklocalstorage_p.h
diff --git a/src/imports/settings/CMakeLists.txt b/src/imports/settings/CMakeLists.txt
index 1b092331ea..c9b570fbf8 100644
--- a/src/imports/settings/CMakeLists.txt
+++ b/src/imports/settings/CMakeLists.txt
@@ -9,6 +9,7 @@ qt_add_qml_module(qmlsettingsplugin
     VERSION "1.1"
     CLASSNAME QmlSettingsPlugin
     SKIP_TYPE_REGISTRATION
+    GENERATE_QMLTYPES
     SOURCES
         plugin.cpp
         qqmlsettings.cpp qqmlsettings_p.h
diff --git a/src/imports/sharedimage/CMakeLists.txt b/src/imports/sharedimage/CMakeLists.txt
index b6a676fe7b..2a5f08af33 100644
--- a/src/imports/sharedimage/CMakeLists.txt
+++ b/src/imports/sharedimage/CMakeLists.txt
@@ -9,6 +9,7 @@ qt_add_qml_module(sharedimageplugin
     VERSION "1.0"
     CLASSNAME QtQuickSharedImagePlugin
     SKIP_TYPE_REGISTRATION
+    GENERATE_QMLTYPES
     SOURCES
         plugin.cpp
         qsharedimageloader.cpp qsharedimageloader_p.h
diff --git a/src/imports/statemachine/CMakeLists.txt b/src/imports/statemachine/CMakeLists.txt
index 64bb6f8787..a20051d148 100644
--- a/src/imports/statemachine/CMakeLists.txt
+++ b/src/imports/statemachine/CMakeLists.txt
@@ -9,6 +9,7 @@ qt_add_qml_module(qtqmlstatemachine
     VERSION "1.15"
     CLASSNAME QtQmlStateMachinePlugin
     SKIP_TYPE_REGISTRATION
+    GENERATE_QMLTYPES
     SOURCES
         childrenprivate.h
         finalstate.cpp finalstate.h
diff --git a/src/imports/testlib/.prev_CMakeLists.txt b/src/imports/testlib/.prev_CMakeLists.txt
index d08507f597..864afa71d5 100644
--- a/src/imports/testlib/.prev_CMakeLists.txt
+++ b/src/imports/testlib/.prev_CMakeLists.txt
@@ -10,6 +10,7 @@ qt_add_qml_module(qmltestplugin
     CLASSNAME QTestQmlModule
     DEPENDENCIES
         QtQuick.Window/2.0
+    GENERATE_QMLTYPES
     SOURCES
         main.cpp
         quicktestevent.cpp quicktestevent_p.h
diff --git a/src/imports/testlib/CMakeLists.txt b/src/imports/testlib/CMakeLists.txt
index 37db859180..cdc3709dd9 100644
--- a/src/imports/testlib/CMakeLists.txt
+++ b/src/imports/testlib/CMakeLists.txt
@@ -10,6 +10,7 @@ qt_add_qml_module(qmltestplugin
     CLASSNAME QTestQmlModule
     DEPENDENCIES
         QtQuick.Window/2.0
+    GENERATE_QMLTYPES
     SOURCES
         main.cpp
         quicktestevent.cpp quicktestevent_p.h
diff --git a/src/imports/wavefrontmesh/CMakeLists.txt b/src/imports/wavefrontmesh/CMakeLists.txt
index c80af8d4dd..9cb11a590d 100644
--- a/src/imports/wavefrontmesh/CMakeLists.txt
+++ b/src/imports/wavefrontmesh/CMakeLists.txt
@@ -9,6 +9,7 @@ qt_add_qml_module(qmlwavefrontmeshplugin
     VERSION "1.15"
     CLASSNAME QmlWavefrontMeshPlugin
     SKIP_TYPE_REGISTRATION
+    GENERATE_QMLTYPES
     SOURCES
         plugin.cpp
         qwavefrontmesh.cpp qwavefrontmesh.h
diff --git a/src/imports/window/CMakeLists.txt b/src/imports/window/CMakeLists.txt
index 71e3d66fa5..8e27eca14c 100644
--- a/src/imports/window/CMakeLists.txt
+++ b/src/imports/window/CMakeLists.txt
@@ -11,6 +11,7 @@ qt_add_qml_module(windowplugin
     DESIGNER_SUPPORTED
     CLASSNAME QtQuick2WindowPlugin
     SKIP_TYPE_REGISTRATION
+    GENERATE_QMLTYPES
     SOURCES
         plugin.cpp plugin.h
     LIBRARIES
diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt
index 799865e80f..1a82389d2f 100644
--- a/src/particles/CMakeLists.txt
+++ b/src/particles/CMakeLists.txt
@@ -6,6 +6,7 @@
 
 qt_add_module(QuickParticles
     INTERNAL_MODULE
+    GENERATE_METATYPES
     SOURCES
         qquickage.cpp qquickage_p.h
         qquickangledirection.cpp qquickangledirection_p.h
@@ -128,3 +129,12 @@ qt_extend_target(QuickParticles CONDITION QT_FEATURE_quick_shadereffect
     SOURCES
         qquickcustomparticle.cpp qquickcustomparticle_p.h
 )
+
+set_target_properties(QuickParticles PROPERTIES
+    QT_QML_MODULE_INSTALL_QMLTYPES TRUE
+    QT_QML_MODULE_VERSION 2.15
+    QT_QML_MODULE_URI QtQuick.Particles
+    QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQuick/Particles.2"
+)
+
+qt6_qml_type_registration(QuickParticles)
diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt
index 16f8cd9058..21fc09bfee 100644
--- a/src/qml/.prev_CMakeLists.txt
+++ b/src/qml/.prev_CMakeLists.txt
@@ -5,6 +5,7 @@
 #####################################################################
 
 qt_add_module(Qml
+    GENERATE_METATYPES
     PLUGIN_TYPES qmltooling
     SOURCES
         ../3rdparty/masm/assembler/*.h
@@ -604,3 +605,12 @@ qt_add_docs(Qml
     doc/qtqml.qdocconf
 )
 
+
+set_target_properties(Qml PROPERTIES
+    QT_QML_MODULE_INSTALL_QMLTYPES TRUE
+    QT_QML_MODULE_VERSION 2.15
+    QT_QML_MODULE_URI QtQml
+    QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml"
+)
+
+qt6_qml_type_registration(Qml)
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index 1ac929ccea..95eabdcf7f 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -5,6 +5,7 @@
 #####################################################################
 
 qt_add_module(Qml
+    GENERATE_METATYPES
     PLUGIN_TYPES qmltooling
     SOURCES
         # ../3rdparty/masm/assembler/*.h special case remove
@@ -611,3 +612,12 @@ qt_add_docs(Qml
     doc/qtqml.qdocconf
 )
 
+
+set_target_properties(Qml PROPERTIES
+    QT_QML_MODULE_INSTALL_QMLTYPES TRUE
+    QT_QML_MODULE_VERSION 2.15
+    QT_QML_MODULE_URI QtQml
+    QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml"
+)
+
+qt6_qml_type_registration(Qml)
diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt
index 5bf34062d3..ca8dcadebc 100644
--- a/src/qmlmodels/CMakeLists.txt
+++ b/src/qmlmodels/CMakeLists.txt
@@ -5,6 +5,7 @@
 #####################################################################
 
 qt_add_module(QmlModels
+    GENERATE_METATYPES
     SOURCES
         qqmlchangeset.cpp qqmlchangeset_p.h
         qqmlmodelsmodule_p.h
@@ -63,3 +64,12 @@ qt_add_docs(QmlModels
     doc/qtqmlmodels.qdocconf
 )
 
+
+set_target_properties(QmlModels PROPERTIES
+    QT_QML_MODULE_INSTALL_QMLTYPES TRUE
+    QT_QML_MODULE_VERSION 2.15
+    QT_QML_MODULE_URI QtQml.Models
+    QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/Models.2"
+)
+
+qt6_qml_type_registration(QmlModels)
diff --git a/src/qmltyperegistrar/CMakeLists.txt b/src/qmltyperegistrar/CMakeLists.txt
index b9683257bc..15721f5f1a 100644
--- a/src/qmltyperegistrar/CMakeLists.txt
+++ b/src/qmltyperegistrar/CMakeLists.txt
@@ -5,6 +5,7 @@
 #####################################################################
 
 qt_add_tool(qmltyperegistrar
+    TOOLS_TARGET Qml # special case
     SOURCES
         ../../tools/shared/qmlstreamwriter.cpp ../../tools/shared/qmlstreamwriter.h
         ../../tools/shared/resourcefilemapper.cpp ../../tools/shared/resourcefilemapper.h
diff --git a/src/qmlworkerscript/.prev_CMakeLists.txt b/src/qmlworkerscript/.prev_CMakeLists.txt
index f9cf2dbd5f..0a27479d36 100644
--- a/src/qmlworkerscript/.prev_CMakeLists.txt
+++ b/src/qmlworkerscript/.prev_CMakeLists.txt
@@ -5,6 +5,7 @@
 #####################################################################
 
 qt_add_module(QmlWorkerScript
+    GENERATE_METATYPES
     SOURCES
         qquickworkerscript.cpp qquickworkerscript_p.h
         qtqmlworkerscriptglobal.h qtqmlworkerscriptglobal_p.h
@@ -99,3 +100,12 @@ qt_add_docs(QmlWorkerScript
     doc/qtqmlworkerscript.qdocconf
 )
 
+
+set_target_properties(QmlWorkerScript PROPERTIES
+    QT_QML_MODULE_INSTALL_QMLTYPES TRUE
+    QT_QML_MODULE_VERSION 2.15
+    QT_QML_MODULE_URI QtQml.WorkerScript
+    QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/WorkerScript.2"
+)
+
+qt6_qml_type_registration(QmlWorkerScript)
diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt
index 1f61555bd1..1ecc6d03f7 100644
--- a/src/qmlworkerscript/CMakeLists.txt
+++ b/src/qmlworkerscript/CMakeLists.txt
@@ -5,6 +5,7 @@
 #####################################################################
 
 qt_add_module(QmlWorkerScript
+    GENERATE_METATYPES
     SOURCES
         qquickworkerscript.cpp qquickworkerscript_p.h
         qtqmlworkerscriptglobal.h qtqmlworkerscriptglobal_p.h
@@ -99,3 +100,12 @@ qt_add_docs(QmlWorkerScript
     doc/qtqmlworkerscript.qdocconf
 )
 
+
+set_target_properties(QmlWorkerScript PROPERTIES
+    QT_QML_MODULE_INSTALL_QMLTYPES TRUE
+    QT_QML_MODULE_VERSION 2.15
+    QT_QML_MODULE_URI QtQml.WorkerScript
+    QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/WorkerScript.2"
+)
+
+qt6_qml_type_registration(QmlWorkerScript)
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt
index eafd135207..23324a4307 100644
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@@ -5,6 +5,7 @@
 #####################################################################
 
 qt_add_module(Quick
+    GENERATE_METATYPES
     PLUGIN_TYPES scenegraph
     SOURCES
         handlers/qquickdragaxis.cpp handlers/qquickdragaxis_p.h
@@ -592,3 +593,12 @@ qt_add_docs(Quick
     doc/qtquick.qdocconf
 )
 
+
+set_target_properties(Quick PROPERTIES
+    QT_QML_MODULE_INSTALL_QMLTYPES TRUE
+    QT_QML_MODULE_VERSION 2.15
+    QT_QML_MODULE_URI QtQuick
+    QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQuick.2"
+)
+
+qt6_qml_type_registration(Quick)
diff --git a/src/quickshapes/CMakeLists.txt b/src/quickshapes/CMakeLists.txt
index b8ef075952..cba1695d3b 100644
--- a/src/quickshapes/CMakeLists.txt
+++ b/src/quickshapes/CMakeLists.txt
@@ -6,6 +6,7 @@
 
 qt_add_module(QuickShapes
     INTERNAL_MODULE
+    GENERATE_METATYPES
     SOURCES
         qquickshape.cpp qquickshape_p.h
         qquickshape_p_p.h
@@ -71,3 +72,12 @@ qt_extend_target(QuickShapes CONDITION QT_FEATURE_opengl
         qquicknvprfunctions_p_p.h
         qquickshapenvprrenderer.cpp qquickshapenvprrenderer_p.h
 )
+
+set_target_properties(QuickShapes PROPERTIES
+    QT_QML_MODULE_INSTALL_QMLTYPES TRUE
+    QT_QML_MODULE_VERSION 1.15
+    QT_QML_MODULE_URI QtQuick.Shapes
+    QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQuick/Shapes"
+)
+
+qt6_qml_type_registration(QuickShapes)
diff --git a/tests/auto/qml/qqmltypeloader/CMakeLists.txt b/tests/auto/qml/qqmltypeloader/CMakeLists.txt
index 4274c8cadf..9c2f992745 100644
--- a/tests/auto/qml/qqmltypeloader/CMakeLists.txt
+++ b/tests/auto/qml/qqmltypeloader/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Generated from tst_qqmltypeloader.pro.
+# Generated from qqmltypeloader.pro.
 
 #####################################################################
 ## tst_qqmltypeloader Test:
@@ -21,13 +21,12 @@ qt_add_test(tst_qqmltypeloader
     LIBRARIES
         Qt::QmlPrivate
     PUBLIC_LIBRARIES
-        Qt::Gui
         Qt::Qml
         Qt::Quick
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:tst_qqmltypeloader.pro:<TRUE>:
+#### Keys ignored in scope 2:.:.:tst_qqmltypeloader.pro:<TRUE>:
 # QML_IMPORT_NAME = "declarative.import.for.typeloader.test"
 # QML_IMPORT_VERSION = "3.2"
 
@@ -43,3 +42,12 @@ qt_extend_target(tst_qqmltypeloader CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
+
+set_target_properties(tst_qqmltypeloader PROPERTIES
+    QT_QML_MODULE_INSTALL_QMLTYPES TRUE
+    QT_QML_MODULE_VERSION 3.2
+    QT_QML_MODULE_URI declarative.import.for.typeloader.test
+)
+
+qt6_qml_type_registration(tst_qqmltypeloader)
+add_subdirectory(SlowImport)