1 files changed, 24 insertions, 40 deletions
diff --git a/src/qmltyperegistrar/CMakeLists.txt b/src/qmltyperegistrar/CMakeLists.txt
index 9145a298c9..7b17e8ddba 100644
--- a/src/qmltyperegistrar/CMakeLists.txt
+++ b/src/qmltyperegistrar/CMakeLists.txt
@@ -1,51 +1,35 @@
-# Generated from qmltyperegistrar.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
-## qmltyperegistrar Tool:
+## qmltyperegistrarprivate:
 #####################################################################
 
-qt_get_tool_target_name(target_name qmltyperegistrar)
-qt_internal_add_tool(${target_name}
-    TARGET_DESCRIPTION "QML Types Registrar"
-    TOOLS_TARGET Qml # special case
+qt_internal_add_module(QmlTypeRegistrarPrivate
+    STATIC
+    INTERNAL_MODULE
     SOURCES
-        ../qmlcompiler/qqmljsstreamwriter.cpp ../qmlcompiler/qqmljsstreamwriter_p.h
-        metatypesjsonprocessor.cpp metatypesjsonprocessor.h
-        qmltyperegistrar.cpp
-        qmltypesclassdescription.cpp qmltypesclassdescription.h
-        qmltypescreator.cpp qmltypescreator.h
+        qanystringviewutils_p.h
+        qmetatypesjsonprocessor.cpp qmetatypesjsonprocessor_p.h
+        qqmljsstreamwriter.cpp qqmljsstreamwriter_p.h
+        qqmltyperegistrar.cpp qqmltyperegistrar_p.h
+        qqmltyperegistrarconstants_p.h
+        qqmltypesclassdescription.cpp qqmltypesclassdescription_p.h
+        qqmltypescreator.cpp qqmltypescreator_p.h
+        qqmltyperegistrarutils_p.h qqmltyperegistrarutils.cpp
+    NO_UNITY_BUILD_SOURCES
+        qqmltypescreator.cpp # S_NAME etc clash
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
-    INCLUDE_DIRECTORIES
-        ../qmlcompiler
     PUBLIC_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:
-#####################################################################
+    GENERATE_CPP_EXPORTS
+    )
 
-#### 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"
-
-# special case begin
-# Install public prf files.
-set(qmltyperegistrar_mkspecs "${CMAKE_CURRENT_SOURCE_DIR}/qmltypes.prf")
-set(mkspecs_install_dir "${INSTALL_MKSPECSDIR}")
-qt_path_join(mkspecs_install_dir "${QT_INSTALL_DIR}" "${mkspecs_install_dir}" "features")
-qt_copy_or_install(FILES "${qmltyperegistrar_mkspecs}"
-                   DESTINATION ${mkspecs_install_dir})
-# special case end
+qt_internal_add_resource(QmlTypeRegistrarPrivate "jsRootMetaTypes"
+    PREFIX
+        "/qt-project.org/meta_types"
+    FILES
+        jsroot_metatypes.json
+)