summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXander Burgerhout <x.burgerhout@tnodiana.com>2016-03-01 10:10:35 +0100
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2016-03-03 10:16:31 +0000
commitca4bce553d03a64fa119650990083267ea9c8d31 (patch)
tree79e11279b8ae30862b6ec2030bc31da10a552344
parent526f459330d9bb5238479523f45aaa4caa958f77 (diff)
downloadqtlocation-5.6.0.tar.gz
Fixes a compile error on linux/gcc-4.8 when using C++98v5.6.05.6.0
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 <alexander.blasche@theqtcompany.com> (cherry picked from commit 3d8a8799cc97aedb28f5046f096d4d35da6ef8ef) Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
-rw-r--r--src/imports/location/qquickgeomapgesturearea.cpp12
1 files 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);