From 4d8fb1bc6f8b57952f930e293d79ffbfc0b0701e Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Fri, 3 Sep 2021 15:11:10 +0200 Subject: [PATCH] cocoa: use TouchPad deviceType for trackpad MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit WheelHandler { acceptedDevices: PointerDevice.TouchPad } doesn't react unless we use the right type. Amends 69c833dae91d004b48f815e0156d6caeb4cdb491 Pick-to: 6.2 Change-Id: I813de096b87f3af4dfcf5510abc0d0bd9c15b689 Reviewed-by: Tor Arne Vestbø --- src/plugins/platforms/cocoa/qnsview_mouse.mm | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/platforms/cocoa/qnsview_mouse.mm b/src/plugins/platforms/cocoa/qnsview_mouse.mm index ffc8182b831..7ef5d3d0533 100644 --- a/src/plugins/platforms/cocoa/qnsview_mouse.mm +++ b/src/plugins/platforms/cocoa/qnsview_mouse.mm @@ -743,6 +743,7 @@ static const QPointingDevice *pointingDeviceFor(qint64 deviceID) auto *devicePriv = QPointingDevicePrivate::get(const_cast(device)); if (!devicePriv->capabilities.testFlag(QInputDevice::Capability::PixelScroll)) { devicePriv->name = QLatin1String("trackpad or magic mouse"); + devicePriv->deviceType = QInputDevice::DeviceType::TouchPad; devicePriv->capabilities |= QInputDevice::Capability::PixelScroll; qCDebug(lcInputDevices) << "mouse scrolling: updated capabilities" << device; }