Rewrite flick and pinch unit tests, fix corner cases

Current implementation of flick and pinch test is error
prone. Current tests depends on each other, which makes
them not usable for qa. Instead of using one large test
function, split test for self contain tests.
Add test for filtering and fix pinch handling accordingly.

New tests cover the case when there are interactive elements like
MouseArea or ScrollView behind or in front of map element.

Change-Id: I47b0f5ae8af65bf0d8110fece7b79e56a89d9534
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/src/imports/location/qdeclarativegeomapgesturearea.cpp b/src/imports/location/qdeclarativegeomapgesturearea.cpp
index 2fabd2b3..8732d79b 100644
--- a/src/imports/location/qdeclarativegeomapgesturearea.cpp
+++ b/src/imports/location/qdeclarativegeomapgesturearea.cpp
@@ -609,7 +609,8 @@ void QDeclarativeGeoMapGestureArea::handleMouseReleaseEvent(QMouseEvent *event)
 void QDeclarativeGeoMapGestureArea::handleMouseUngrabEvent()
 {
     m_mousePoint.reset();
-    update();
+    if (m_touchPoints.isEmpty())
+        update();
 }
 
 /*!
@@ -629,6 +630,8 @@ void QDeclarativeGeoMapGestureArea::handleTouchEvent(QTouchEvent *event)
     m_touchPoints.clear();
     for (int i = 0; i < event->touchPoints().count(); ++i)
         m_touchPoints << event->touchPoints().at(i);
+    if (event->touchPoints().count() >= 2)
+        event->accept();
     update();
 }