aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2022-09-07 16:23:59 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-09-08 06:01:34 +0000
commitc6571f2da1a5df5afe9b451ece87585b0cc90ab3 (patch)
tree5371c13628c71109e9c583d0f3bbda004f3bb95d /src
parentadd6e8d4e57ada3c698500c4103407dbe453d34c (diff)
Don't assert that a passive grabber is a pointer handler
Since 375e4003902e56e1cfd4192cee47566161b7b32d a passive grabber can sometimes be an Item (so far, only Drawer does it). Fixes: QTBUG-106391 Change-Id: I52cd70fda9257acecfc4919ff54179006ff9843b Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io> (cherry picked from commit 1902912c2a8a0b4080048116403a0bdc70f8772f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r--src/quick/items/qquickitem.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index c2d16f3133..61effb2756 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -8933,8 +8933,8 @@ void QQuickItemPrivate::localizedTouchEvent(const QTouchEvent *event, bool isFil
// So hopefully if we start from one passive grabber and go up the parent chain from there,
// we will find any filtering parent items that exist.
auto handler = qmlobject_cast<QQuickPointerHandler *>(pg.first());
- Q_ASSERT(handler);
- pointGrabber = handler->parentItem();
+ if (handler)
+ pointGrabber = handler->parentItem();
}
}