QGestureManager: use gesture owner target if topLevelAt returns nullptr

For security reason, Wayland doesn't provide global position for top level windows, so topLevelAt is not supported. Fixes: QTBUG-113404 Pick-to: 6.7 6.5 6.2 5.15 Change-Id: Id60b8b77a1843344db4d4e4c13382ad87adac806 Reviewed-by: Tor Arne Vestbø <[email protected]>
brad0 · Apr 22, 2024 · 10c3dd8 · 10c3dd8
1 parent d935a89
commit 10c3dd8
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/widgets/kernel/qgesturemanager.cpp b/src/widgets/kernel/qgesturemanager.cpp
@@ -610,7 +610,8 @@ void QGestureManager::deliverEvents(const QSet<QGesture *> &gestures,
                     QWidget *child = topLevel->childAt(topLevel->mapFromGlobal(pt));
                     target = child ? child : topLevel;
                 }
-            } else {
+            }
+            if (!target) {
                 // or use the context of the gesture
                 QObject *context = m_gestureOwners.value(gesture, 0);
                 if (context->isWidgetType())