diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-01 23:00:31 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-01 23:00:31 +0100 |
| commit | 99a1ba7c488939f606628593e7d21e42aa583502 (patch) | |
| tree | 4ed34a0bc7500a9a429d8009f4777fb7250ab65f /examples/location | |
| parent | f87ba0409856a678e8a940b70f7452c3a1b730c3 (diff) | |
| parent | eea315187d1add70aaf69745c031b8d6342b2303 (diff) | |
| download | qtlocation-99a1ba7c488939f606628593e7d21e42aa583502.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/imports/location/qdeclarativegeomap.cpp
src/imports/location/qdeclarativegeomap_p.h
Change-Id: Iaf232acbe9098eb1b57f571638dd37f75b2ff345
Diffstat (limited to 'examples/location')
| -rw-r--r-- | examples/location/mapviewer/map/MapComponent.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/location/mapviewer/map/MapComponent.qml b/examples/location/mapviewer/map/MapComponent.qml index ece4798b..d2d526d1 100644 --- a/examples/location/mapviewer/map/MapComponent.qml +++ b/examples/location/mapviewer/map/MapComponent.qml @@ -269,7 +269,7 @@ Map { //! [mapnavigation] // Enable pan, flick, and pinch gestures to zoom in and out - gesture.activeGestures: MapGestureArea.PanGesture | MapGestureArea.FlickGesture | MapGestureArea.ZoomGesture + gesture.acceptedGestures: MapGestureArea.PanGesture | MapGestureArea.FlickGesture | MapGestureArea.PinchGesture gesture.flickDeceleration: 3000 gesture.enabled: true //! [mapnavigation] |