Don't try to maintain a current and active list of points for the app and widgets/items

Instead, build the list of touchPoints per event. This solves the problem when encountering
releases early in the active/current list while there are still touch points in move/stationary
states (which effectively caused the code to "forget" about the released point).

1 files changed, 0 insertions, 4 deletions

diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 88b9a66..01c7c4a 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -4031,7 +4031,6 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
     // Note: TouchUpdate and TouchEnd events are sent to d->currentMultitouchWidget and never propagated
     {
         QWidget *widget = static_cast<QWidget *>(receiver);
-        QWidget *origin = widget;
         QTouchEvent *touchEvent = static_cast<QTouchEvent *>(e);
         bool eventAccepted = touchEvent->isAccepted();
         if (widget->testAttribute(Qt::WA_AcceptTouchEvents) && e->spontaneous()) {
@@ -4055,9 +4054,6 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
                     QTouchEvent::TouchPoint *touchPoint = touchEvent->touchPoints().at(i);
                     d->widgetForTouchPointId[touchPoint->id()] = widget;
                 }
-                if (origin != widget)
-                    d->widgetCurrentTouchPoints.remove(origin);
-                d->widgetCurrentTouchPoints[widget] = touchEvent->touchPoints();
                 break;
             } else if (widget->isWindow() || widget->testAttribute(Qt::WA_NoMousePropagation)) {
                 break;