diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-21 15:14:53 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-21 15:14:53 +0100 |
| commit | e80ba97cd95f0b01ef79b9f99c9ab499aac4249f (patch) | |
| tree | 5bc67490e744cc41ff779a6a9079c35be95b8385 | |
| parent | dc6b519f08916b8e48d27700e87c3e355fffbd33 (diff) | |
| parent | 628cf98e820f552f228d6f71c770c293fce83a79 (diff) | |
| download | qtlocation-e80ba97cd95f0b01ef79b9f99c9ab499aac4249f.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: If768f08fd6a7bc55dc65ebec9db1ccd23aa3bdf9
| -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) |