diff options
| -rw-r--r-- | src/qml/Qt6QmlBuildInternals.cmake | 1 | ||||
| -rw-r--r-- | src/qml/Qt6QmlMacros.cmake | 15 |
2 files changed, 1 insertions, 15 deletions
diff --git a/src/qml/Qt6QmlBuildInternals.cmake b/src/qml/Qt6QmlBuildInternals.cmake index fdc199f423..585ea2024f 100644 --- a/src/qml/Qt6QmlBuildInternals.cmake +++ b/src/qml/Qt6QmlBuildInternals.cmake @@ -304,7 +304,6 @@ function(qt_internal_add_qml_module target) # Update the backing and plugin targets with qml-specific things. qt6_add_qml_module(${target} ${add_qml_module_args} - __QT_INTERNAL_INSTALL_METATYPES_JSON OUTPUT_DIRECTORY ${arg_OUTPUT_DIRECTORY} RESOURCE_PREFIX "/qt-project.org/imports" OUTPUT_TARGETS output_targets diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake index 016a0d387a..d3bbbd304a 100644 --- a/src/qml/Qt6QmlMacros.cmake +++ b/src/qml/Qt6QmlMacros.cmake @@ -34,10 +34,6 @@ function(qt6_add_qml_module target) SKIP_TYPE_REGISTRATION ENABLE_TYPE_COMPILER - # Used only by _qt_internal_qml_type_registration() - # TODO: Remove this once qt6_extract_metatypes does not install by default. - __QT_INTERNAL_INSTALL_METATYPES_JSON - # Used to mark modules as having static side effects (i.e. if they install an image provider) __QT_INTERNAL_STATIC_MODULE # Used to mark modules as being a system module that provides all builtins @@ -523,9 +519,6 @@ function(qt6_add_qml_module target) if(NOT arg_NO_GENERATE_QMLTYPES) set(type_registration_extra_args "") - if(arg___QT_INTERNAL_INSTALL_METATYPES_JSON) - list(APPEND type_registration_extra_args __QT_INTERNAL_INSTALL_METATYPES_JSON) - endif() if(arg_NAMESPACE) list(APPEND type_registration_extra_args NAMESPACE ${arg_NAMESPACE}) endif() @@ -2296,7 +2289,7 @@ endif() # generated into. (OPTIONAL) # function(_qt_internal_qml_type_registration target) - set(args_option __QT_INTERNAL_INSTALL_METATYPES_JSON) + set(args_option) set(args_single NAMESPACE) set(args_multi MANUAL_MOC_JSON_FILES) @@ -2326,12 +2319,6 @@ function(_qt_internal_qml_type_registration target) if(arg_MANUAL_MOC_JSON_FILES) list(APPEND meta_types_json_args "MANUAL_MOC_JSON_FILES" ${arg_MANUAL_MOC_JSON_FILES}) endif() - - # Don't install the metatypes json files by default for user project created qml modules. - # Only install them for Qt provided qml modules. - if(NOT arg___QT_INTERNAL_INSTALL_METATYPES_JSON) - list(APPEND meta_types_json_args __QT_INTERNAL_NO_INSTALL) - endif() qt6_extract_metatypes(${target} ${meta_types_json_args}) get_target_property(import_version ${target} QT_QML_MODULE_VERSION) |