MPTA: don't allow more than one touchpoint to react to mouse

On mouse press, if MPTA filters events for a child, addTouchPoint()
can be called once during filtering and start reacting to that point,
and then called again during direct delivery of the same mouse press.
Now it will ignore the second of the declared touchpoint prototypes
because the first one is already "taken", and a mouse event can never
provide more than one point. Followup to
0012f8bd152a36a67abc696465f27d612625b5d9

Fixes: QTBUG-83662
Change-Id: Ia97600441f0a2633f77b0db9c83cc4de3a9e5931
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 9b64eee22d9e2d40d1283e8844cb1d8899232547)
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

2 files changed, 92 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickmultipointtoucharea/data/nestedPinchArea.qml b/tests/auto/quick/qquickmultipointtoucharea/data/nestedPinchArea.qml
new file mode 100644
index 0000000000..0e51804b30
--- /dev/null
+++ b/tests/auto/quick/qquickmultipointtoucharea/data/nestedPinchArea.qml
@@ -0,0 +1,44 @@
+import QtQuick 2.15
+
+MultiPointTouchArea {
+    width: 240
+    height: 320
+    mouseEnabled: true
+    property int pressedCount: 0
+    property int updatedCount: 0
+    property int releasedCount: 0
+
+    onPressed: (points) => { pressedCount = points.length }
+    onUpdated: (points) => { updatedCount = points.length }
+    onReleased: (points) => { releasedCount = points.length }
+
+    touchPoints: [
+        TouchPoint {
+            id: point1
+            objectName: "point1"
+        },
+        TouchPoint {
+            id: point2
+            objectName: "point2"
+        }
+    ]
+
+    PinchArea {
+        anchors.fill: parent
+    }
+
+    Rectangle {
+        width: 30; height: 30
+        color: "green"
+        x: point1.x
+        y: point1.y
+    }
+
+    Rectangle {
+        id: rectangle
+        width: 30; height: 30
+        color: "yellow"
+        x: point2.x
+        y: point2.y
+    }
+}
diff --git a/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp b/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp
index 22b7f946ce..2a9e6760a8 100644
--- a/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp
+++ b/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp
@@ -74,6 +74,7 @@ private slots:
     void cancel();
     void stationaryTouchWithChangingPressure();
     void touchFiltering();
+    void nestedPinchAreaMouse();
 
 private:
     QQuickView *createAndShowView(const QString &file);
@@ -1397,6 +1398,53 @@ void tst_QQuickMultiPointTouchArea::touchFiltering() // QTBUG-74028
     QCOMPARE(mptaSpy.count(), 1);
 }
 
+void tst_QQuickMultiPointTouchArea::nestedPinchAreaMouse() // QTBUG-83662
+{
+    QScopedPointer<QQuickView> window(createAndShowView("nestedPinchArea.qml"));
+    QQuickMultiPointTouchArea *mpta = qobject_cast<QQuickMultiPointTouchArea *>(window->rootObject());
+    QVERIFY(mpta);
+
+    QQuickTouchPoint *point1 = mpta->findChild<QQuickTouchPoint*>("point1");
+    QCOMPARE(point1->pressed(), false);
+    QQuickTouchPoint *point2 = mpta->findChild<QQuickTouchPoint*>("point2");
+    QCOMPARE(point2->pressed(), false);
+    QSignalSpy pressedSpy(mpta, &QQuickMultiPointTouchArea::pressed);
+    QSignalSpy updatedSpy(mpta, &QQuickMultiPointTouchArea::updated);
+    QSignalSpy releasedSpy(mpta, &QQuickMultiPointTouchArea::released);
+
+    QPoint p1(20, 20);
+    QTest::mousePress(window.data(), Qt::LeftButton, Qt::NoModifier, p1);
+    QCOMPARE(point1->pressed(), true);
+    QCOMPARE(point2->pressed(), false);
+    QCOMPARE(pressedSpy.count(), 1);
+    QCOMPARE(mpta->property("pressedCount").toInt(), 1);
+    QCOMPARE(updatedSpy.count(), 0);
+    QCOMPARE(mpta->property("updatedCount").toInt(), 0);
+    QCOMPARE(releasedSpy.count(), 0);
+    QCOMPARE(mpta->property("releasedCount").toInt(), 0);
+
+    p1 += QPoint(0, 15);
+    QTest::mouseMove(window.data(), p1);
+    QCOMPARE(point1->pressed(), true);
+    QCOMPARE(point2->pressed(), false);
+    QCOMPARE(pressedSpy.count(), 1);
+    QCOMPARE(mpta->property("pressedCount").toInt(), 1);
+    QCOMPARE(updatedSpy.count(), 1);
+    QCOMPARE(mpta->property("updatedCount").toInt(), 1);
+    QCOMPARE(releasedSpy.count(), 0);
+    QCOMPARE(mpta->property("releasedCount").toInt(), 0);
+
+    QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, p1);
+    QCOMPARE(point1->pressed(), false);
+    QCOMPARE(point2->pressed(), false);
+    QCOMPARE(pressedSpy.count(), 1);
+    QCOMPARE(mpta->property("pressedCount").toInt(), 1);
+    QCOMPARE(updatedSpy.count(), 1);
+    QCOMPARE(mpta->property("updatedCount").toInt(), 1);
+    QCOMPARE(releasedSpy.count(), 1);
+    QCOMPARE(mpta->property("releasedCount").toInt(), 1);
+}
+
 QTEST_MAIN(tst_QQuickMultiPointTouchArea)
 
 #include "tst_qquickmultipointtoucharea.moc"