From e1e9e89f34e28693a833506c5e5bc73cf338c6de Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Thu, 9 Feb 2023 20:15:55 +0200 Subject: [PATCH] wayland: Remove SeatInterfacePrivate::accumulatedCapabilities The seat no longer posts the relevant protocol error. --- src/wayland/seat_interface.cpp | 3 --- src/wayland/seat_interface_p.h | 1 - 2 files changed, 4 deletions(-) diff --git a/src/wayland/seat_interface.cpp b/src/wayland/seat_interface.cpp index e7f6754ea6..390d22abe4 100644 --- a/src/wayland/seat_interface.cpp +++ b/src/wayland/seat_interface.cpp @@ -327,7 +327,6 @@ void SeatInterface::setHasKeyboard(bool has) } else { d->capabilities &= ~SeatInterfacePrivate::capability_keyboard; } - d->accumulatedCapabilities |= d->capabilities; d->sendCapabilities(); Q_EMIT hasKeyboardChanged(has); @@ -343,7 +342,6 @@ void SeatInterface::setHasPointer(bool has) } else { d->capabilities &= ~SeatInterfacePrivate::capability_pointer; } - d->accumulatedCapabilities |= d->capabilities; d->sendCapabilities(); Q_EMIT hasPointerChanged(has); @@ -359,7 +357,6 @@ void SeatInterface::setHasTouch(bool has) } else { d->capabilities &= ~SeatInterfacePrivate::capability_touch; } - d->accumulatedCapabilities |= d->capabilities; d->sendCapabilities(); Q_EMIT hasTouchChanged(has); diff --git a/src/wayland/seat_interface_p.h b/src/wayland/seat_interface_p.h index 6d9a9fcd87..9a28ee17a4 100644 --- a/src/wayland/seat_interface_p.h +++ b/src/wayland/seat_interface_p.h @@ -49,7 +49,6 @@ public: QPointer display; QString name; std::chrono::milliseconds timestamp = std::chrono::milliseconds::zero(); - quint32 accumulatedCapabilities = 0; quint32 capabilities = 0; std::unique_ptr keyboard; std::unique_ptr pointer;