Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I18bb1c341e7d87cd1d649f2c3fc9c50141c6a1a9

1 files changed, 6 insertions, 6 deletions

diff --git a/src/imports/location/qquickgeomapgesturearea.cpp b/src/imports/location/qquickgeomapgesturearea.cpp
index f324d10e..629c9658 100644
--- a/src/imports/location/qquickgeomapgesturearea.cpp
+++ b/src/imports/location/qquickgeomapgesturearea.cpp
@@ -393,9 +393,9 @@ void QQuickGeoMapGestureArea::setAcceptedGestures(AcceptedGestures acceptedGestu
         return;
     m_acceptedGestures = acceptedGestures;
 
-    setPanEnabled(acceptedGestures & GeoMapGesture::PanGesture);
-    setFlickEnabled(acceptedGestures & GeoMapGesture::FlickGesture);
-    setPinchEnabled(acceptedGestures & GeoMapGesture::PinchGesture);
+    setPanEnabled(acceptedGestures & PanGesture);
+    setFlickEnabled(acceptedGestures & FlickGesture);
+    setPinchEnabled(acceptedGestures & PinchGesture);
 
     emit acceptedGesturesChanged();
 }
@@ -434,9 +434,9 @@ void QQuickGeoMapGestureArea::setEnabled(bool enabled)
     m_enabled = enabled;
 
     if (enabled) {
-        setPanEnabled(m_acceptedGestures & GeoMapGesture::PanGesture);
-        setFlickEnabled(m_acceptedGestures & GeoMapGesture::FlickGesture);
-        setPinchEnabled(m_acceptedGestures & GeoMapGesture::PinchGesture);
+        setPanEnabled(m_acceptedGestures & PanGesture);
+        setFlickEnabled(m_acceptedGestures & FlickGesture);
+        setPinchEnabled(m_acceptedGestures & PinchGesture);
     } else {
         setPanEnabled(false);
         setFlickEnabled(false);