From e168e1fc80231c0e2751b4f6f2a736efadff92fa Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Mon, 2 Sep 2024 18:18:04 +0200 Subject: [PATCH] client: Provide seat name to QPointingDevice Followup to c16f6d40518fce6576c311c658956e21f7d52372 Task-number: QTBUG-85272 Task-number: QTBUG-115207 Pick-to: 6.8 Change-Id: Icb6053e76432bb9ef58f1457da073695a674c6f6 Reviewed-by: David Edmundson --- src/plugins/platforms/wayland/qwaylandinputdevice.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp index a3f5d5ab5eb..79bfd6d11fd 100644 --- a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp +++ b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp @@ -446,7 +446,7 @@ void QWaylandInputDevice::seat_capabilities(uint32_t caps) mTouchPadDevice = new QPointingDevice( QLatin1String("touchpad"), 0, QInputDevice::DeviceType::TouchPad, QPointingDevice::PointerType::Finger, QInputDevice::Capability::Position, - MaxTouchPoints, 0, QString(), QPointingDeviceUniqueId(), this); + MaxTouchPoints, 0, mSeatName, QPointingDeviceUniqueId(), this); QWindowSystemInterface::registerInputDevice(mTouchPadDevice); mPointerGesturePinch.reset(pointerGestures->createPointerGesturePinch(this)); mPointerGesturePinch->init(pointerGestures->get_pinch_gesture(mPointer->object())); @@ -467,7 +467,7 @@ void QWaylandInputDevice::seat_capabilities(uint32_t caps) mTouchDevice = new QPointingDevice( QLatin1String("some touchscreen"), 0, QInputDevice::DeviceType::TouchScreen, QPointingDevice::PointerType::Finger, QInputDevice::Capability::Position, - MaxTouchPoints, 0,QString(), QPointingDeviceUniqueId(), this); + MaxTouchPoints, 0, mSeatName, QPointingDeviceUniqueId(), this); QWindowSystemInterface::registerInputDevice(mTouchDevice); } } else if (!(caps & WL_SEAT_CAPABILITY_TOUCH) && mTouch) {