From 03b026e2c46ac8badd7391897b67a54358479bfa Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Wed, 18 Aug 2021 18:16:17 +1000 Subject: Use the new QML CMake API for examples, tests and docs The qt6_qml_type_registration() command will become internal. Update the examples, tests and docs to no longer call this command and use the new QML CMake API available from Qt 6.2 instead. Task-number: QTBUG-95093 Pick-to: 6.2 Change-Id: Ibd62ccb4e2723a64d8a2c4418982037419d19855 Reviewed-by: Ulf Hermann --- .../declarative_positioning_core/CMakeLists.txt | 25 +++++++++------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'tests') diff --git a/tests/auto/declarative_positioning_core/CMakeLists.txt b/tests/auto/declarative_positioning_core/CMakeLists.txt index 673d2856..0afb3021 100644 --- a/tests/auto/declarative_positioning_core/CMakeLists.txt +++ b/tests/auto/declarative_positioning_core/CMakeLists.txt @@ -22,19 +22,14 @@ qt_internal_add_test(tst_declarative_positioning_core TESTDATA ${test_data} ) -# special case begin - -# These properties are required for the qt6_qml_type_registration() -# to work properly -set_target_properties(tst_declarative_positioning_core - PROPERTIES - QT_QML_MODULE_URI TestFactory - QT_QML_MODULE_VERSION 1.0 +qt_add_qml_module(tst_declarative_positioning_core + URI TestFactory + VERSION 1.0 + QML_FILES + tst_address.qml + tst_coordinate.qml + tst_geoshape.qml + tst_position.qml + tst_positionsource.qml + NO_RESOURCE_TARGET_PATH ) - -qt6_qml_type_registration(tst_declarative_positioning_core) - -# special case end - -#### Keys ignored in scope 1:.:.:declarative_positioning_core.pro:: -# TEMPLATE = "app" -- cgit v1.2.1