diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2012-07-06 10:40:41 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-06 07:04:40 +0200 |
| commit | 5b2e0b219e265e4b7945d1c0e5762a9b07fb25e6 (patch) | |
| tree | 41871875e1e8beaeabcacf22ee440340c601edbe /examples | |
| parent | e1d5a05fc2c017bc93f179154513b2fb6a9a33b7 (diff) | |
Remove uses of deprecated MapPinchArea and MapFlickable.
These elements/properties are deprecated use the MapGestureArea and
gesture properties instead.
Change-Id: I755e69f6394dda7a92c33aa1fe37efcfd84aa9ff
Reviewed-by: Ian Chen <ian.1.chen@nokia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/declarative/mapviewer/content/map/MapComponent.qml | 8 | ||||
| -rw-r--r-- | examples/declarative/places/content/places/MapComponent.qml | 10 | ||||
| -rw-r--r-- | examples/declarative/places/places.qml | 1 |
3 files changed, 4 insertions, 15 deletions
diff --git a/examples/declarative/mapviewer/content/map/MapComponent.qml b/examples/declarative/mapviewer/content/map/MapComponent.qml index 0dec59e7..07f91b3d 100644 --- a/examples/declarative/mapviewer/content/map/MapComponent.qml +++ b/examples/declarative/mapviewer/content/map/MapComponent.qml @@ -48,14 +48,10 @@ Map { center: nokiaCoordinate // Enable pinch gestures to zoom in and out - pinch.activeGestures: MapPinchArea.ZoomGesture - pinch.enabled: true + gesture.flickDeceleration: 3000 + gesture.enabled: true - // And flicking gestures for quick panning - flick.enabled: true - flick.deceleration: 3000 //! [top] - property variant markers property variant mapItems property int markerCounter: 0 // counter for total amount of markers. Resets to 0 when number of markers = 0 diff --git a/examples/declarative/places/content/places/MapComponent.qml b/examples/declarative/places/content/places/MapComponent.qml index 42936bb5..e8dc165e 100644 --- a/examples/declarative/places/content/places/MapComponent.qml +++ b/examples/declarative/places/content/places/MapComponent.qml @@ -47,14 +47,8 @@ Map { zoomLevel: (maximumZoomLevel - minimumZoomLevel)/2 center: brisbaneCoordinate - pinch.activeGestures: MapPinchArea.ZoomGesture - pinch.enabled: true - - // Flicking - flick.enabled: true - flick.deceleration: 3000 - signal mapPressed() // replace with - // signal mousePressed(MouseEvent mouse) when QTBUG-14550 is fixed + gesture.flickDeceleration: 3000 + gesture.enabled: true property bool followme: false property variant scaleLengths: [5, 10, 20, 50, 100, 200, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000, 2000000] diff --git a/examples/declarative/places/places.qml b/examples/declarative/places/places.qml index d5b1b0f9..72fddff4 100644 --- a/examples/declarative/places/places.qml +++ b/examples/declarative/places/places.qml @@ -511,7 +511,6 @@ Item { z: backgroundRect.z + 1 width: page.width height: page.height - mainMenu.height - onMapPressed: page.state = "" MapItemView { model: placeSearchModel |