Initialize activeTouchPoints in the loop itself instead of before

This will make it easier to make the change to sending touch events to multiple widgets.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index b9262af..fbedd19 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -4049,8 +4049,7 @@ bool QApplicationPrivate::translateTouchEvent(const MSG &msg)
         return false;
 
     QEvent::Type eventType = QEvent::None;
-    QList<QTouchEvent::TouchPoint *> activeTouchPoints = currentTouchPoints;
-
+    QList<QTouchEvent::TouchPoint *> activeTouchPoints;
     QVector<TOUCHINPUT> winTouchInputs(msg.wParam);
     memset(winTouchInputs.data(), 0, sizeof(TOUCHINPUT) * winTouchInputs.count());
     QApplicationPrivate::GetTouchInputInfo((HANDLE) msg.lParam, msg.wParam, winTouchInputs.data(), sizeof(TOUCHINPUT));
@@ -4082,6 +4081,7 @@ bool QApplicationPrivate::translateTouchEvent(const MSG &msg)
             touchPoint->d->globalPos = touchPoint->d->startGlobalPos = touchPoint->d->lastGlobalPos = globalPos;
             touchPoint->d->pressure = qreal(1.);
         } else if (down && (touchInput.dwFlags & TOUCHEVENTF_UP)) {
+            activeTouchPoints = currentTouchPoints;
             eventType = removeActiveTouch(touchPoint);
 
             touchPoint->d->state = Qt::TouchPointReleased;
@@ -4089,6 +4089,8 @@ bool QApplicationPrivate::translateTouchEvent(const MSG &msg)
             touchPoint->d->globalPos = globalPos;
             touchPoint->d->pressure = qreal(0.);
         } else if (down) {
+            if (activeTouchPoints.isEmpty())
+                activeTouchPoints = currentTouchPoints;
             eventType = QEvent::TouchUpdate;
             touchPoint->d->state = globalPos == touchPoint->d->globalPos
                                    ? Qt::TouchPointStationary