diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-16 11:24:18 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-18 08:28:28 +0200 |
| commit | 8103b8ce129b607003728171dd6b0d4756263441 (patch) | |
| tree | 808338f566c8876d854fa94eff7aca616da6b3c3 | |
| parent | 89e01c0b9a48beefd5a1fc63f77739bdcdbf6f4e (diff) | |
CMake: Adjust to public API renaming in qtbase
Task-number: QTBUG-86827
Change-Id: Ibeae878cbd7cc43031aeb13b2c480215c849f8bc
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/qml/Qt6QmlMacros.cmake | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qmltyperegistrar/foreign/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake index 9d6024459f..2d085bcbcf 100644 --- a/src/qml/Qt6QmlMacros.cmake +++ b/src/qml/Qt6QmlMacros.cmake @@ -608,7 +608,7 @@ function(qt6_qml_type_registration target) set(meta_types_json_args "INSTALL_DIR" "${qml_install_dir}/lib/metatypes") endif() - qt6_generate_meta_types_json_file(${target} ${meta_types_json_args}) + qt6_extract_metatypes(${target} ${meta_types_json_args}) get_target_property(import_version ${target} QT_QML_MODULE_VERSION) get_target_property(target_source_dir ${target} SOURCE_DIR) diff --git a/tests/auto/qml/qmltyperegistrar/foreign/CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/foreign/CMakeLists.txt index dc969c2468..ad967cdbf0 100644 --- a/tests/auto/qml/qmltyperegistrar/foreign/CMakeLists.txt +++ b/tests/auto/qml/qmltyperegistrar/foreign/CMakeLists.txt @@ -13,7 +13,7 @@ qt_internal_add_cmake_library(foreign ) # special case begin qt_enable_autogen_tool(foreign "moc" ON) -qt6_generate_meta_types_json_file(foreign) +qt6_extract_metatypes(foreign) # special case end #### Keys ignored in scope 1:.:.:foreign.pro:<TRUE>: |