aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2016-07-25 14:16:27 +0200
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2016-07-25 12:18:22 +0000
commit34c555b55474f49c8ce4d27c0563c023e34bc604 (patch)
treeea6a641c18c5cbe85b4d5d6d2c3111595e0317a9 /src/quick
parentaa48ecd09b56cee3fb34d48b70c6138a1d675f2a (diff)
Fix QQuickPointerTouchEvent::grabbers()
The loop would iterate over cached points that were not part of the event. Change-Id: I16a1f52c1616b7bdc5aec2fce4d7d7593edd0e18 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/quick')
-rw-r--r--src/quick/items/qquickevents.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp
index ea1a6e263e..773ba264ba 100644
--- a/src/quick/items/qquickevents.cpp
+++ b/src/quick/items/qquickevents.cpp
@@ -613,7 +613,8 @@ bool QQuickPointerTouchEvent::allPointsAccepted() const {
QVector<QQuickItem *> QQuickPointerTouchEvent::grabbers() const
{
QVector<QQuickItem *> result;
- for (auto point : qAsConst(m_touchPoints)) {
+ for (int i = 0; i < m_pointCount; ++i) {
+ auto point = m_touchPoints.at(i);
if (QQuickItem *grabber = point->grabber()) {
if (!result.contains(grabber))
result << grabber;