diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-09-23 15:19:59 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-09-28 17:14:34 +0200 |
| commit | 104e1bb73f19eff5ca5c136bdbcb99e2e4bc196b (patch) | |
| tree | 4fb6da407bad9d9e69493980c5a069ab50eb248c /tests | |
| parent | 49a72acedbe4f66c94aca39f8ce9b2ea1e694366 (diff) | |
| download | qtlocation-104e1bb73f19eff5ca5c136bdbcb99e2e4bc196b.tar.gz | |
Build system: move to declarative type registration
Adjust the build system accordingly, attaching a QML module with
the respective implementations to the QtLocation target.
An explicit function is still needed to register converters, and will
be removed once the improved support for value types has merged.
This should enable the qml compiler to generate C++ code, which then
requires linking against the library.
The MapParameter type was renamed to DynamicMapParamter as per the
5.11 change log, so remove the MapParameter alias now and adjust
tests.
Task-number: QTBUG-106886
Change-Id: Id8765c1bc3b98d447d768b246b21a16f71bfdf74
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative_location_core/tst_routing.qml | 6 | ||||
| -rw-r--r-- | tests/auto/declarative_ui/tst_map.qml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/declarative_location_core/tst_routing.qml b/tests/auto/declarative_location_core/tst_routing.qml index 6fc92f8a..7d442d96 100644 --- a/tests/auto/declarative_location_core/tst_routing.qml +++ b/tests/auto/declarative_location_core/tst_routing.qml @@ -573,7 +573,7 @@ Item { coordinate: QtPositioning.coordinate(71, 71) bearing: 43 - MapParameter { + DynamicMapParameter { id: param1 type: "user_distance" property real distance: 10 @@ -854,7 +854,7 @@ Item { compare(model.get(0).path[0].latitude, fcoordinate1.latitude + 1) // new value should be echoed // Extra parameter - var param = Qt.createQmlObject ('import QtLocation 5.9; MapParameter { type : "test-traveltime"; property var requestedTime : 42}', root) + var param = Qt.createQmlObject ('import QtLocation 5.9; DynamicMapParameter { type : "test-traveltime"; property var requestedTime : 42}', root) var initialParams = cloneArray(filledRouteQuery.quickChildren) var modifiedParams = cloneArray(initialParams) modifiedParams.push(param) @@ -877,7 +877,7 @@ Item { compare(model.get(0).travelTime, 123456) else compare(model.get(0).travelTime, 0) - var secondParam = Qt.createQmlObject ('import QtLocation 5.9; MapParameter { type : "foo"; property var bar : 42}', root) + var secondParam = Qt.createQmlObject ('import QtLocation 5.9; DynamicMapParameter { type : "foo"; property var bar : 42}', root) modifiedParams.push(secondParam) param.requestedTime = 44 filledRouteQuery.quickChildren = modifiedParams diff --git a/tests/auto/declarative_ui/tst_map.qml b/tests/auto/declarative_ui/tst_map.qml index 4fc910ed..290b8f25 100644 --- a/tests/auto/declarative_ui/tst_map.qml +++ b/tests/auto/declarative_ui/tst_map.qml @@ -131,7 +131,7 @@ Item { height: 200 } - MapParameter { + DynamicMapParameter { id: testParameter type: "cameraCenter_test" property var center: QtPositioning.coordinate(-33.0, -47.0) |