diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-01 01:00:10 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-01 01:00:10 +0200 |
| commit | bbc52bcbb6391c4925df26672eb1f26040c6f67c (patch) | |
| tree | 14b8580e21aecc5b08a35f69ac55e7fbc3aef3ba /src/quick/handlers/qquickmultipointhandler_p.h | |
| parent | 5ff4facd8efc41b30b5ffa5abb6a12406685ca0b (diff) | |
| parent | cc0829cbf300e56360e3d61efe4dfd20efcabb1c (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I6e9b5fbf50da24cae9e555723a5f1d8365d4a2f3
Diffstat (limited to 'src/quick/handlers/qquickmultipointhandler_p.h')
| -rw-r--r-- | src/quick/handlers/qquickmultipointhandler_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/handlers/qquickmultipointhandler_p.h b/src/quick/handlers/qquickmultipointhandler_p.h index 199ea7cd10..94142013cc 100644 --- a/src/quick/handlers/qquickmultipointhandler_p.h +++ b/src/quick/handlers/qquickmultipointhandler_p.h @@ -93,7 +93,7 @@ protected: bool wantsPointerEvent(QQuickPointerEvent *event) override; void handlePointerEventImpl(QQuickPointerEvent *event) override; void onActiveChanged() override; - void onGrabChanged(QQuickPointerHandler *grabber, QQuickEventPoint::GrabState stateChange, QQuickEventPoint *point) override; + void onGrabChanged(QQuickPointerHandler *grabber, QQuickEventPoint::GrabTransition transition, QQuickEventPoint *point) override; bool hasCurrentPoints(QQuickPointerEvent *event); QVector<QQuickEventPoint *> eligiblePoints(QQuickPointerEvent *event); qreal averageTouchPointDistance(const QPointF &ref); |