diff --git a/keyboard_layout.cpp b/keyboard_layout.cpp index 8ebc095a94..39b72f41d4 100644 --- a/keyboard_layout.cpp +++ b/keyboard_layout.cpp @@ -176,6 +176,8 @@ void KeyboardLayout::notifyLayoutChange() } static const QString s_keyboardService = QStringLiteral("org.kde.keyboard"); +// this exists because in Plasma 5.21 we want to use a new applet for wayland, but still have the legacy system in use on X11 +static const QString s_keyboardService_appletTrigger = QStringLiteral("org.kde.keyboard.wayland"); static const QString s_keyboardObject = QStringLiteral("/Layouts"); KeyboardLayoutDBusInterface::KeyboardLayoutDBusInterface(Xkb *xkb, const KConfigGroup &configGroup, KeyboardLayout *parent) @@ -190,11 +192,13 @@ KeyboardLayoutDBusInterface::KeyboardLayoutDBusInterface(Xkb *xkb, const KConfig QDBusConnection::sessionBus().registerObject(s_keyboardObject, this, QDBusConnection::ExportAllSlots | QDBusConnection::ExportAllSignals); QDBusConnection::sessionBus().registerService(s_keyboardService); + QDBusConnection::sessionBus().registerService(s_keyboardService_appletTrigger); } KeyboardLayoutDBusInterface::~KeyboardLayoutDBusInterface() { QDBusConnection::sessionBus().unregisterService(s_keyboardService); + QDBusConnection::sessionBus().unregisterService(s_keyboardService_appletTrigger); } void KeyboardLayoutDBusInterface::switchToNextLayout()