qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make qt6_qml_type_registration() internal 

This renames the command to _qt_internal_qml_type_registration().
The tests are only updated to use the new name so as to keep this to a
minimal change.

Fixes: QTBUG-95093
Pick-to: 6.2
Change-Id: Ie3a7f6adc312050df64213fdcdc62886ad21ff01
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
This commit is contained in:
Craig Scott 2021-08-24 22:02:08 +10:00
parent 519541b9b3
commit c1273bf1d0
10 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/qml/Qt6QmlMacros.cmake
View File

@ -21,7 +21,7 @@ function(qt6_add_qml_module target)
# TODO: Remove once all usages have also been removed
SKIP_TYPE_REGISTRATION
# Used only by qt6_qml_type_registration()
# 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
)
@ -442,7 +442,7 @@ function(qt6_add_qml_module target)
if(arg___QT_INTERNAL_INSTALL_METATYPES_JSON)
list(APPEND type_registration_extra_args __QT_INTERNAL_INSTALL_METATYPES_JSON)
endif()
qt6_qml_type_registration(${target} ${type_registration_extra_args})
_qt_internal_qml_type_registration(${target} ${type_registration_extra_args})
endif()
set(output_targets)
@ -1585,10 +1585,6 @@ if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
endfunction()
endif()
# NOTE: This function does not normally need to be called directly by projects.
# It is called automatically by qt6_add_qml_module() unless
# NO_GENERATE_QMLTYPES is also given to that function.
#
# target: Expected to be the backing target for a qml module. Certain target
# properties normally set by qt6_add_qml_module() will be retrieved from this
# target. (REQUIRED)
@ -1596,7 +1592,7 @@ endif()
# MANUAL_MOC_JSON_FILES: Specifies a list of json files, generated by a manual
# moc call, to extract metatypes. (OPTIONAL)
#
function(qt6_qml_type_registration target)
function(_qt_internal_qml_type_registration target)
set(args_option __QT_INTERNAL_INSTALL_METATYPES_JSON)
set(args_single "")
set(args_multi MANUAL_MOC_JSON_FILES)
@ -1819,9 +1815,19 @@ function(qt6_qml_type_registration target)
)
endfunction()
function(qt6_qml_type_registration)
message(FATAL_ERROR
"This function, previously available under Technical Preview, has been removed. "
"Please use qt6_add_qml_module() instead."
)
endfunction()
if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
function(qt_qml_type_registration)
qt6_qml_type_registration(${ARGV})
message(FATAL_ERROR
"This function, previously available under Technical Preview, has been removed. "
"Please use qt_add_qml_module() instead."
)
endfunction()
endif()

2
tests/auto/qml/qmltyperegistrar/CMakeLists.txt
View File

@ -44,5 +44,5 @@ set_target_properties(tst_qmltyperegistrar PROPERTIES
# qt6_add_qml_module() doesn't allow us to pass through MANUAL_MOC_JSON_FILES
# yet, so we have to call it directly to test that code path for now.
qt6_qml_type_registration(tst_qmltyperegistrar MANUAL_MOC_JSON_FILES ${json_list})
_qt_internal_qml_type_registration(tst_qmltyperegistrar MANUAL_MOC_JSON_FILES ${json_list})
add_subdirectory(foreign)

2
tests/auto/qml/qqmlanybinding/CMakeLists.txt
View File

@ -29,7 +29,7 @@ set_target_properties(tst_qqmlanybinding PROPERTIES
QT_QML_MODULE_URI bindable
)
qt6_qml_type_registration(tst_qqmlanybinding)
_qt_internal_qml_type_registration(tst_qqmlanybinding)
## Scopes:
#####################################################################

2
tests/auto/qml/qqmlbinding/CMakeLists.txt
View File

@ -31,7 +31,7 @@ set_target_properties(tst_qqmlbinding PROPERTIES
QT_QML_MODULE_VERSION 1.0
)
qt6_qml_type_registration(tst_qqmlbinding)
_qt_internal_qml_type_registration(tst_qqmlbinding)
## Scopes:

2
tests/auto/qml/qqmlinfo/CMakeLists.txt
View File

@ -47,4 +47,4 @@ set_target_properties(tst_qqmlinfo PROPERTIES
QT_QML_MODULE_URI org.qtproject.Test
)
qt6_qml_type_registration(tst_qqmlinfo)
_qt_internal_qml_type_registration(tst_qqmlinfo)

2
tests/auto/qml/qqmllanguage/CMakeLists.txt
View File

@ -67,4 +67,4 @@ set_target_properties(tst_qqmllanguage PROPERTIES
QT_QML_MODULE_URI StaticTest
)
qt6_qml_type_registration(tst_qqmllanguage)
_qt_internal_qml_type_registration(tst_qqmllanguage)

2
tests/auto/qml/qqmlproperty/CMakeLists.txt
View File

@ -47,4 +47,4 @@ set_target_properties(tst_qqmlproperty PROPERTIES
QT_QML_MODULE_URI io.qt.bugreports
)
qt6_qml_type_registration(tst_qqmlproperty)
_qt_internal_qml_type_registration(tst_qqmlproperty)

2
tests/auto/qml/qqmltypeloader/CMakeLists.txt
View File

@ -56,5 +56,5 @@ set_target_properties(tst_qqmltypeloader PROPERTIES
QT_QML_MODULE_URI declarative.import.for.typeloader.test
)
qt6_qml_type_registration(tst_qqmltypeloader)
_qt_internal_qml_type_registration(tst_qqmltypeloader)
add_subdirectory(SlowImport)

2
tests/auto/qml/registrationmacros/CMakeLists.txt
View File

@ -14,4 +14,4 @@ set_target_properties(tst_registrationmacros PROPERTIES
QT_QML_MODULE_URI test
)
qt6_qml_type_registration(tst_registrationmacros)
_qt_internal_qml_type_registration(tst_registrationmacros)

2
tests/auto/quick/qquickbehaviors/CMakeLists.txt
View File

@ -31,7 +31,7 @@ set_target_properties(tst_qquickbehaviors PROPERTIES
QT_QML_MODULE_URI test
)
qt6_qml_type_registration(tst_qquickbehaviors)
_qt_internal_qml_type_registration(tst_qquickbehaviors)
#### Keys ignored in scope 1:.:.:qquickbehaviors.pro:<TRUE>: