diff options
| -rw-r--r-- | examples/location/minimal_map/main.qml | 5 | ||||
| -rw-r--r-- | src/location/maps/MapView.qml | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/examples/location/minimal_map/main.qml b/examples/location/minimal_map/main.qml index 7093ceb6..70f30d5a 100644 --- a/examples/location/minimal_map/main.qml +++ b/examples/location/minimal_map/main.qml @@ -43,9 +43,10 @@ Window { } WheelHandler { id: wheel - // workaround for QTBUG-87646 / QTBUG-112394: + // workaround for QTBUG-87646 / QTBUG-112394 / QTBUG-112432: // Magic Mouse pretends to be a trackpad but doesn't work with PinchHandler - acceptedDevices: Qt.platform.pluginName === "cocoa" + // and we don't yet distinguish mice and trackpads on Wayland either + acceptedDevices: Qt.platform.pluginName === "cocoa" || Qt.platform.pluginName === "wayland" ? PointerDevice.Mouse | PointerDevice.TouchPad : PointerDevice.Mouse rotationScale: 1/120 diff --git a/src/location/maps/MapView.qml b/src/location/maps/MapView.qml index 70d2105e..5ee96f63 100644 --- a/src/location/maps/MapView.qml +++ b/src/location/maps/MapView.qml @@ -103,9 +103,10 @@ Item { } WheelHandler { id: wheel - // workaround for QTBUG-87646 / QTBUG-112394: + // workaround for QTBUG-87646 / QTBUG-112394 / QTBUG-112432: // Magic Mouse pretends to be a trackpad but doesn't work with PinchHandler - acceptedDevices: Qt.platform.pluginName === "cocoa" + // and we don't yet distinguish mice and trackpads on Wayland either + acceptedDevices: Qt.platform.pluginName === "cocoa" || Qt.platform.pluginName === "wayland" ? PointerDevice.Mouse | PointerDevice.TouchPad : PointerDevice.Mouse onWheel: (event) => { |