2 files changed, 96 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickmultipointtoucharea/data/cancel.qml b/tests/auto/quick/qquickmultipointtoucharea/data/cancel.qml
new file mode 100644
index 0000000000..e108003bca
--- /dev/null
+++ b/tests/auto/quick/qquickmultipointtoucharea/data/cancel.qml
@@ -0,0 +1,41 @@
+import QtQuick 2.0
+
+MultiPointTouchArea {
+    width: 240
+    height: 320
+
+    minimumTouchPoints: 1
+    maximumTouchPoints: 5
+    touchPoints: [
+        TouchPoint { objectName: "point1" },
+        TouchPoint { objectName: "point2" },
+        TouchPoint { objectName: "point3" },
+        TouchPoint { objectName: "point4" },
+        TouchPoint { objectName: "point5" }
+    ]
+
+    function clearCounts() {
+        touchPointPressCount = 0;
+        touchPointUpdateCount = 0;
+        touchPointReleaseCount = 0;
+        touchPointCancelCount = 0;
+        touchCount = 0;
+        touchUpdatedHandled = false;
+    }
+
+    property int touchPointPressCount: 0
+    property int touchPointUpdateCount: 0
+    property int touchPointReleaseCount: 0
+    property int touchPointCancelCount: 0
+    property int touchCount: 0
+    property bool touchUpdatedHandled: false
+
+    onPressed: { touchPointPressCount = touchPoints.length }
+    onUpdated: { touchPointUpdateCount = touchPoints.length }
+    onReleased: { touchPointReleaseCount = touchPoints.length }
+    onCanceled: { touchPointCancelCount = touchPoints.length }
+    onTouchUpdated: {
+        touchCount = touchPoints.length
+        touchUpdatedHandled = true
+    }
+}
diff --git a/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp b/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp
index 8320d899f9..c3981c466f 100644
--- a/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp
+++ b/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp
@@ -69,6 +69,7 @@ private slots:
     void transformedTouchArea();
     void mouseInteraction();
     void mouseInteraction_data();
+    void cancel();
 
 private:
     QQuickView *createAndShowView(const QString &file);
@@ -1195,6 +1196,60 @@ void tst_QQuickMultiPointTouchArea::mouseInteraction()
     QCOMPARE(area->property("touchCount").toInt(), 0);
 }
 
+void tst_QQuickMultiPointTouchArea::cancel()
+{
+    QScopedPointer<QQuickView> window(createAndShowView("cancel.qml"));
+    QVERIFY(window->rootObject() != 0);
+
+    QQuickMultiPointTouchArea *area = qobject_cast<QQuickMultiPointTouchArea *>(window->rootObject());
+    QTest::QTouchEventSequence sequence = QTest::touchEvent(window.data(), device);
+    QQuickTouchPoint *point1 = area->findChild<QQuickTouchPoint*>("point1");
+
+    QPoint p1(20,100);
+    sequence.press(0, p1).commit();
+    QQuickTouchUtils::flush(window.data());
+    QCOMPARE(point1->pressed(), true);
+    QCOMPARE(area->property("touchPointPressCount").toInt(), 1);
+    QCOMPARE(area->property("touchPointUpdateCount").toInt(), 0);
+    QCOMPARE(area->property("touchPointReleaseCount").toInt(), 0);
+    QCOMPARE(area->property("touchPointCancelCount").toInt(), 0);
+    QCOMPARE(area->property("touchCount").toInt(), 1);
+    QMetaObject::invokeMethod(area, "clearCounts");
+
+    area->setVisible(false);
+    // we should get a onCancel signal
+    QCOMPARE(point1->pressed(), false);
+    QCOMPARE(area->property("touchPointPressCount").toInt(), 0);
+    QCOMPARE(area->property("touchPointUpdateCount").toInt(), 0);
+    QCOMPARE(area->property("touchPointReleaseCount").toInt(), 0);
+    QCOMPARE(area->property("touchPointCancelCount").toInt(), 1);
+    QCOMPARE(area->property("touchCount").toInt(), 0);
+    QMetaObject::invokeMethod(area, "clearCounts");
+    area->setVisible(true);
+
+
+    sequence.press(0, p1).commit();
+    QQuickTouchUtils::flush(window.data());
+    QCOMPARE(point1->pressed(), true);
+    QCOMPARE(area->property("touchPointPressCount").toInt(), 1);
+    QCOMPARE(area->property("touchPointUpdateCount").toInt(), 0);
+    QCOMPARE(area->property("touchPointReleaseCount").toInt(), 0);
+    QCOMPARE(area->property("touchPointCancelCount").toInt(), 0);
+    QCOMPARE(area->property("touchCount").toInt(), 1);
+    QMetaObject::invokeMethod(area, "clearCounts");
+
+    area->setEnabled(false);
+    // we should get a onCancel signal
+    QCOMPARE(point1->pressed(), false);
+    QCOMPARE(area->property("touchPointPressCount").toInt(), 0);
+    QCOMPARE(area->property("touchPointUpdateCount").toInt(), 0);
+    QCOMPARE(area->property("touchPointReleaseCount").toInt(), 0);
+    QCOMPARE(area->property("touchPointCancelCount").toInt(), 1);
+    QCOMPARE(area->property("touchCount").toInt(), 0);
+    QMetaObject::invokeMethod(area, "clearCounts");
+
+}
+
 
 QTEST_MAIN(tst_QQuickMultiPointTouchArea)