From ca4bce553d03a64fa119650990083267ea9c8d31 Mon Sep 17 00:00:00 2001 From: Xander Burgerhout Date: Tue, 1 Mar 2016 10:10:35 +0100 Subject: Fixes a compile error on linux/gcc-4.8 when using C++98 Removed GeoMapGesture:: prefix where appropriate, as referring to an enum value in this manner is not allowed in C++98. Task-number: QTBUG-51541 Change-Id: I374d1c8db530d34766772345761fdc899b57d7fe Reviewed-by: Alex Blasche (cherry picked from commit 3d8a8799cc97aedb28f5046f096d4d35da6ef8ef) Reviewed-by: Lars Knoll --- src/imports/location/qquickgeomapgesturearea.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/imports/location/qquickgeomapgesturearea.cpp b/src/imports/location/qquickgeomapgesturearea.cpp index 9bb8068b..b96f1ccd 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); -- cgit v1.2.3