Fix MapGestureArea consuming mouse events.

If MapGestureArea.enable == false, allow mouse events to be passed
on to the Map's parent item.

Change-Id: I9d7fc2ca760193e6b523565a7459612db927f909
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>

1 files changed, 9 insertions, 0 deletions

diff --git a/src/imports/location/qdeclarativegeomapgesturearea.cpp b/src/imports/location/qdeclarativegeomapgesturearea.cpp
index e75b41f1..c7f9926d 100644
--- a/src/imports/location/qdeclarativegeomapgesturearea.cpp
+++ b/src/imports/location/qdeclarativegeomapgesturearea.cpp
@@ -566,6 +566,9 @@ QTouchEvent::TouchPoint makeTouchPointFromMouseEvent(QMouseEvent *event, Qt::Tou
 */
 bool QDeclarativeGeoMapGestureArea::mousePressEvent(QMouseEvent *event)
 {
+    if (!(enabled_ && activeGestures_))
+        return false;
+
     touchPoints_.clear();
     touchPoints_ << makeTouchPointFromMouseEvent(event, Qt::TouchPointPressed);
 
@@ -578,6 +581,9 @@ bool QDeclarativeGeoMapGestureArea::mousePressEvent(QMouseEvent *event)
 */
 bool QDeclarativeGeoMapGestureArea::mouseMoveEvent(QMouseEvent *event)
 {
+    if (!(enabled_ && activeGestures_))
+        return false;
+
     touchPoints_.clear();
 
     touchPoints_ << makeTouchPointFromMouseEvent(event, Qt::TouchPointMoved);
@@ -590,6 +596,9 @@ bool QDeclarativeGeoMapGestureArea::mouseMoveEvent(QMouseEvent *event)
 */
 bool QDeclarativeGeoMapGestureArea::mouseReleaseEvent(QMouseEvent *)
 {
+    if (!(enabled_ && activeGestures_))
+        return false;
+
     touchPoints_.clear();
     update();
     return true;