diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-10-07 14:35:56 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-10-08 10:13:27 +0200 |
| commit | 9ce346411eb5bd71ae84647999030ae47c3c544a (patch) | |
| tree | d382c8002dcc9005d9c0919951c24b599a129626 /src/quick/items/qquickflickable.cpp | |
| parent | 8d9819734516a2fe0853acfd0b2cfd3364465c7a (diff) | |
Amend QQFlickablePrivate::wantsPointerEvent() to take QPointerEvent
...now that we're done with the cherry-pick to 5.15.
Amends 6857ad3e686a5e2b45d28a7f47dca3210608da50.
Task-number: QTBUG-74046
Task-number: QTBUG-85302
Change-Id: I3c2ec091976bcfc170ff58d8fcd226dcdf4c90d2
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/quick/items/qquickflickable.cpp')
| -rw-r--r-- | src/quick/items/qquickflickable.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index f29153967a..8c65962174 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -2444,7 +2444,8 @@ bool QQuickFlickable::filterMouseEvent(QQuickItem *receiver, QMouseEvent *event) bool QQuickFlickable::childMouseEventFilter(QQuickItem *i, QEvent *e) { Q_D(QQuickFlickable); - if (!isVisible() || !isEnabled() || !isInteractive() || !d->wantsPointerEvent(e)) { + Q_ASSERT(e->isPointerEvent()); + if (!isVisible() || !isEnabled() || !isInteractive() || !d->wantsPointerEvent(static_cast<QPointerEvent *>(e))) { d->cancelInteraction(); return QQuickItem::childMouseEventFilter(i, e); } |