diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2022-11-08 15:24:49 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2022-11-10 11:52:35 +0100 |
| commit | a1cd5b446f5dd61f0792e5a394f45c8d28455793 (patch) | |
| tree | 98f75368e14ce1c5f055ca2a5851f87d7c8a0995 /src | |
| parent | f8cf17166c9af147f0b8fea72f5b4a8a6098a5d7 (diff) | |
QML: Don't generate qmldir typeinfo entry on NO_GENERATE_QMLTYPES
We explicitly don't want qmltypes in this case.
Change-Id: I2a93cbcef426d739111c17d8637a917cb0dfe6ce
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/Qt6QmlMacros.cmake | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake index faa08c6f1d..3d847b7924 100644 --- a/src/qml/Qt6QmlMacros.cmake +++ b/src/qml/Qt6QmlMacros.cmake @@ -375,7 +375,7 @@ function(qt6_add_qml_module target) target_link_libraries(${target} PRIVATE ${QT_CMAKE_EXPORT_NAMESPACE}::Qml) endif() - if(NOT arg_TYPEINFO) + if(NOT arg_TYPEINFO AND NOT arg_NO_GENERATE_QMLTYPES) set(arg_TYPEINFO ${target}.qmltypes) endif() @@ -489,12 +489,17 @@ function(qt6_add_qml_module target) QT_QML_MODULE_OUTPUT_DIRECTORY "${arg_OUTPUT_DIRECTORY}" QT_QML_MODULE_RESOURCE_PREFIX "${qt_qml_module_resource_prefix}" QT_QML_MODULE_PAST_MAJOR_VERSIONS "${arg_PAST_MAJOR_VERSIONS}" - QT_QML_MODULE_TYPEINFO "${arg_TYPEINFO}" # TODO: Check how this is used by qt6_android_generate_deployment_settings() QT_QML_IMPORT_PATH "${arg_IMPORT_PATH}" ) + if(arg_TYPEINFO) + set_target_properties(${target} PROPERTIES + QT_QML_MODULE_TYPEINFO "${arg_TYPEINFO}" + ) + endif() + # Executables don't have a plugin target, so no need to export the properties. if(NOT backing_target_type STREQUAL "EXECUTABLE" AND NOT is_android_executable) set_property(TARGET ${target} APPEND PROPERTY @@ -3239,8 +3244,9 @@ function(qt6_query_qml_module target) endif() # This should always be set to something non-empty + # unless we've explicitly said NO_GENERATE_QMLTYPES get_target_property(typeinfo ${target} QT_QML_MODULE_TYPEINFO) - if(arg_TYPEINFO) + if(arg_TYPEINFO AND typeinfo) set(${arg_TYPEINFO} "${output_dir}/${typeinfo}" PARENT_SCOPE) endif() |