diff options
author | Jan Arve Saether <jan-arve.saether@qt.io> | 2017-02-24 16:42:47 +0100 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-05-23 05:52:18 +0000 |
commit | 5d4f488bf30f5650051d6cc226a75dbd17cd9a70 (patch) | |
tree | 827f71d5ad7eee909faa60133d0d521aa0b56958 /src/quick/handlers/qquicktaphandler.cpp | |
parent | 057fc4b5b037284ffe299a28725fcf59c7ac066f (diff) |
Move properties into grouped "point" property
Change-Id: I80000110a2e0ca69210322a0fcc587d86158358e
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/handlers/qquicktaphandler.cpp')
-rw-r--r-- | src/quick/handlers/qquicktaphandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/handlers/qquicktaphandler.cpp b/src/quick/handlers/qquicktaphandler.cpp index d73e9fd100..272c6de000 100644 --- a/src/quick/handlers/qquicktaphandler.cpp +++ b/src/quick/handlers/qquicktaphandler.cpp @@ -128,7 +128,7 @@ bool QQuickTapHandler::wantsEventPoint(QQuickEventPoint *point) ret = parentContains(point); break; case ReleaseWithinBounds: - ret = point->pointId() == pointId(); + ret = point->pointId() == this->point().id(); break; } break; @@ -143,7 +143,7 @@ bool QQuickTapHandler::wantsEventPoint(QQuickEventPoint *point) // so onGrabChanged(this, CancelGrabExclusive, point) and setPressed(false) will be called. // But when m_gesturePolicy is DragThreshold, we don't get an exclusive grab, but // we still don't want to be pressed anymore. - if (!ret && point->pointId() == pointId() && point->state() != QQuickEventPoint::Stationary) + if (!ret && point->pointId() == this->point().id() && point->state() != QQuickEventPoint::Stationary) setPressed(false, true, point); return ret; } |