Merge remote-tracking branch 'origin/5.15.0' into 5.15

Change-Id: I1b46a9485d86f4d8ea104df31366fb6ad16a4654

1 files changed, 4 insertions, 1 deletions

diff --git a/src/plugins/platforms/cocoa/qmultitouch_mac.mm b/src/plugins/platforms/cocoa/qmultitouch_mac.mm
index 95256657fe..ac2317b217 100644
--- a/src/plugins/platforms/cocoa/qmultitouch_mac.mm
+++ b/src/plugins/platforms/cocoa/qmultitouch_mac.mm
@@ -184,7 +184,10 @@ QCocoaTouch::getCurrentTouchPointList(NSEvent *event, bool acceptSingleTouch)
     if (_touchCount != _currentTouches.size()) {
         // Remove all instances, and basically start from scratch:
         touchPoints.clear();
-        for (QCocoaTouch *qcocoaTouch : _currentTouches) {
+        // Deleting touch points will remove them from current touches,
+        // so we make a copy of the touches before iterating them.
+        const auto currentTouchesSnapshot = _currentTouches;
+        for (QCocoaTouch *qcocoaTouch : currentTouchesSnapshot) {
             if (!_updateInternalStateOnly) {
                 qcocoaTouch->_touchPoint.state = Qt::TouchPointReleased;
                 touchPoints.insert(qcocoaTouch->_touchPoint.id, qcocoaTouch->_touchPoint);