diff options
author | Craig Scott <craig.scott@qt.io> | 2021-08-24 22:02:08 +1000 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-25 16:47:50 +0000 |
commit | cab8e3920f09212c9dc812d14ab2c0fba002147e (patch) | |
tree | 1de8c896f3a8d8b0c213da3cd89746cf8906959a /tests | |
parent | 04aad00ff2cf9fa2062670b592eff1394527a0da (diff) |
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
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>
(cherry picked from commit c1273bf1d0bbe66c3e89b035ed4b8e2fd21b22e7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qml/qmltyperegistrar/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/qml/qqmlanybinding/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/qml/qqmlbinding/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/qml/qqmlinfo/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/qml/qqmllanguage/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/qml/qqmlproperty/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/qml/qqmltypeloader/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/qml/registrationmacros/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/quick/qquickbehaviors/CMakeLists.txt | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/qml/qmltyperegistrar/CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/CMakeLists.txt index bc00560cca..101b13cbb0 100644 --- a/tests/auto/qml/qmltyperegistrar/CMakeLists.txt +++ b/tests/auto/qml/qmltyperegistrar/CMakeLists.txt @@ -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) diff --git a/tests/auto/qml/qqmlanybinding/CMakeLists.txt b/tests/auto/qml/qqmlanybinding/CMakeLists.txt index 83c9bd7994..926a230bb3 100644 --- a/tests/auto/qml/qqmlanybinding/CMakeLists.txt +++ b/tests/auto/qml/qqmlanybinding/CMakeLists.txt @@ -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: ##################################################################### diff --git a/tests/auto/qml/qqmlbinding/CMakeLists.txt b/tests/auto/qml/qqmlbinding/CMakeLists.txt index 6bf1668970..eeb9f391e3 100644 --- a/tests/auto/qml/qqmlbinding/CMakeLists.txt +++ b/tests/auto/qml/qqmlbinding/CMakeLists.txt @@ -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: diff --git a/tests/auto/qml/qqmlinfo/CMakeLists.txt b/tests/auto/qml/qqmlinfo/CMakeLists.txt index 4d234e8ce0..9a66dd0728 100644 --- a/tests/auto/qml/qqmlinfo/CMakeLists.txt +++ b/tests/auto/qml/qqmlinfo/CMakeLists.txt @@ -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) diff --git a/tests/auto/qml/qqmllanguage/CMakeLists.txt b/tests/auto/qml/qqmllanguage/CMakeLists.txt index e7fa05d23e..372e6086ed 100644 --- a/tests/auto/qml/qqmllanguage/CMakeLists.txt +++ b/tests/auto/qml/qqmllanguage/CMakeLists.txt @@ -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) diff --git a/tests/auto/qml/qqmlproperty/CMakeLists.txt b/tests/auto/qml/qqmlproperty/CMakeLists.txt index 2dabf0f948..21f4372058 100644 --- a/tests/auto/qml/qqmlproperty/CMakeLists.txt +++ b/tests/auto/qml/qqmlproperty/CMakeLists.txt @@ -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) diff --git a/tests/auto/qml/qqmltypeloader/CMakeLists.txt b/tests/auto/qml/qqmltypeloader/CMakeLists.txt index b56dbd8944..8c16b922e4 100644 --- a/tests/auto/qml/qqmltypeloader/CMakeLists.txt +++ b/tests/auto/qml/qqmltypeloader/CMakeLists.txt @@ -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) diff --git a/tests/auto/qml/registrationmacros/CMakeLists.txt b/tests/auto/qml/registrationmacros/CMakeLists.txt index 6ac5d4506c..3e01ae34c8 100644 --- a/tests/auto/qml/registrationmacros/CMakeLists.txt +++ b/tests/auto/qml/registrationmacros/CMakeLists.txt @@ -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) diff --git a/tests/auto/quick/qquickbehaviors/CMakeLists.txt b/tests/auto/quick/qquickbehaviors/CMakeLists.txt index b864b0c21b..e75d0b7973 100644 --- a/tests/auto/quick/qquickbehaviors/CMakeLists.txt +++ b/tests/auto/quick/qquickbehaviors/CMakeLists.txt @@ -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>: |