diff options
| author | Aaron McCarthy <aaron.mccarthy@jollamobile.com> | 2014-01-28 16:19:43 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-06 01:38:38 +0100 |
| commit | 5748de7e54af9d6f20c89a3f4383a297fb70987e (patch) | |
| tree | d08ab18a46989dc949c90882dddbc923d8169972 /tests | |
| parent | 545e3f0540a1bd8e431391e325038fabca915867 (diff) | |
| download | qtlocation-5748de7e54af9d6f20c89a3f4383a297fb70987e.tar.gz | |
Missing changes from MapMouseArea removal.
MapMouseArea has been removed. Remove MapMouseEvent, it is no longer
required.
Remove some remaining MapMouseArea instances in the tests.
Change-Id: I12c534bb3360f6a19ec9e1dd40ecf7bb0d7b8e21
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative_ui/tst_map_item.qml | 2 | ||||
| -rw-r--r-- | tests/auto/declarative_ui/tst_map_item_fit_viewport.qml | 2 | ||||
| -rw-r--r-- | tests/auto/declarative_ui/tst_map_mouse.qml | 13 |
3 files changed, 2 insertions, 15 deletions
diff --git a/tests/auto/declarative_ui/tst_map_item.qml b/tests/auto/declarative_ui/tst_map_item.qml index cfb1c51b..3afae572 100644 --- a/tests/auto/declarative_ui/tst_map_item.qml +++ b/tests/auto/declarative_ui/tst_map_item.qml @@ -140,7 +140,7 @@ Item { latitude: 10 longitude: 30 } - MapMouseArea { + MouseArea { id: preMapRectMa anchors.fill: parent drag.target: parent diff --git a/tests/auto/declarative_ui/tst_map_item_fit_viewport.qml b/tests/auto/declarative_ui/tst_map_item_fit_viewport.qml index 26cef4f8..7c32fd65 100644 --- a/tests/auto/declarative_ui/tst_map_item_fit_viewport.qml +++ b/tests/auto/declarative_ui/tst_map_item_fit_viewport.qml @@ -135,7 +135,7 @@ Item { border.width: 0 topLeft: preMapRectangleDefaultTopLeft bottomRight: preMapRectangleDefaultBottomRight - MapMouseArea { + MouseArea { id: preMapRectMa anchors.fill: parent drag.target: parent diff --git a/tests/auto/declarative_ui/tst_map_mouse.qml b/tests/auto/declarative_ui/tst_map_mouse.qml index d059bcfb..3931b1ca 100644 --- a/tests/auto/declarative_ui/tst_map_mouse.qml +++ b/tests/auto/declarative_ui/tst_map_mouse.qml @@ -84,10 +84,6 @@ Item { // General-purpose elements for the test: Plugin { id: testPlugin; name : "qmlgeo.test.plugin"; allowExperimental: true } - MapMouseEvent{ - id: mapMouseEvent - } - function setMouseData(ma, me) { ma.lastX = me.x @@ -353,15 +349,6 @@ Item { compare(mouseUpperClickedSpy.count, 1) } - function test_aab_event_basic_properties() { - compare(mapMouseEvent.accepted, false) - compare(mapMouseEvent.button, Qt.NoButton) - compare(mapMouseEvent.modifiers, Qt.NoModifier) - compare(mapMouseEvent.wasHeld, false) - compare(mapMouseEvent.x, 0) - compare(mapMouseEvent.y, 0) - } - function test_basic_position_changed() { // tests basic position changed/move when button is being pressed clear_data(); |