diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-21 13:12:00 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-21 13:12:00 +0100 |
| commit | 628cf98e820f552f228d6f71c770c293fce83a79 (patch) | |
| tree | 13dfa54be3f26c2f26101e2dcbc230b85250468b | |
| parent | 633b0f40ca82709863bad48e0ed6a1c92ad3b8b4 (diff) | |
| parent | 6c1c24e8e47895e7ce045d9650e2b161c7c014f9 (diff) | |
| download | qtlocation-628cf98e820f552f228d6f71c770c293fce83a79.tar.gz | |
Merge remote-tracking branch 'origin/5.12.2' into 5.12
Change-Id: I2d9e5f32cc238b9d2276ff85f12946a54bee2263
| -rw-r--r-- | tests/auto/declarative_ui/tst_map_error.qml | 4 | ||||
| -rw-r--r-- | tests/auto/declarative_ui/tst_map_item.qml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/declarative_ui/tst_map_error.qml b/tests/auto/declarative_ui/tst_map_error.qml index 35613f63..a5e122f0 100644 --- a/tests/auto/declarative_ui/tst_map_error.qml +++ b/tests/auto/declarative_ui/tst_map_error.qml @@ -147,9 +147,9 @@ Item { function test_map_toCoordinate() { map_no_plugin.center = coordinate - compare(map_no_plugin.toCoordinate(50,50).isValid,false) + compare(map_no_plugin.toCoordinate(Qt.point(50,50)).isValid,false) map_error_plugin.center = coordinate - compare(map_error_plugin.toCoordinate(50,50).isValid,false) + compare(map_error_plugin.toCoordinate(Qt.point(50,50)).isValid,false) } function test_map_fromCoordinate() diff --git a/tests/auto/declarative_ui/tst_map_item.qml b/tests/auto/declarative_ui/tst_map_item.qml index 1646fdba..68437c51 100644 --- a/tests/auto/declarative_ui/tst_map_item.qml +++ b/tests/auto/declarative_ui/tst_map_item.qml @@ -443,7 +443,7 @@ Item { map.center = preMapCircle.center verify(LocationTestHelper.waitForPolished(map)) point = map.fromCoordinate(preMapCircle.center) - targetCoordinate = map.toCoordinate(51, 51) + targetCoordinate = map.toCoordinate(Qt.point(51, 51)) mousePress(map, point.x, point.y) for (i = 0; i < 50; i += 1) { wait(1) |