Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kguiaddons for openSUSE:Factory checked in at 2022-05-16 18:06:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kguiaddons (Old) and /work/SRC/openSUSE:Factory/.kguiaddons.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kguiaddons" Mon May 16 18:06:54 2022 rev:102 rq:977172 version:5.94.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kguiaddons/kguiaddons.changes 2022-04-11 23:48:29.271588606 +0200 +++ /work/SRC/openSUSE:Factory/.kguiaddons.new.1538/kguiaddons.changes 2022-05-16 18:08:40.565283080 +0200 @@ -1,0 +2,13 @@ +Tue May 10 08:17:57 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.94.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.94.0 +- Changes since 5.93.0: + * Remove outdated comment about qt11extras_p.h + * Un-pluginify modifierkeyinfo + * Add plugin for wayland keystates + * Add windows CI + +------------------------------------------------------------------- Old: ---- kguiaddons-5.93.0.tar.xz kguiaddons-5.93.0.tar.xz.sig New: ---- kguiaddons-5.94.0.tar.xz kguiaddons-5.94.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kguiaddons.spec ++++++ --- /var/tmp/diff_new_pack.jTnEMr/_old 2022-05-16 18:08:41.221283701 +0200 +++ /var/tmp/diff_new_pack.jTnEMr/_new 2022-05-16 18:08:41.225283705 +0200 @@ -17,7 +17,7 @@ %define lname libKF5GuiAddons5 -%define _tar_path 5.93 +%define _tar_path 5.94 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -25,7 +25,7 @@ # Only needed for the package signature condition %bcond_without released Name: kguiaddons -Version: 5.93.0 +Version: 5.94.0 Release: 0 Summary: Utilities for graphical user interfaces License: LGPL-2.1-or-later @@ -46,6 +46,7 @@ BuildRequires: cmake(Qt5WaylandClient) >= 5.15.0 BuildRequires: cmake(Qt5Widgets) >= 5.15.0 BuildRequires: cmake(Qt5X11Extras) >= 5.15.0 +BuildRequires: cmake(PlasmaWaylandProtocols) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) @@ -101,11 +102,7 @@ %files -n %{lname} %license LICENSES/* %doc README* -%dir %{_kf5_plugindir}/kf5/ -%dir %{_kf5_plugindir}/kf5/kguiaddons -%dir %{_kf5_plugindir}/kf5/kguiaddons/kmodifierkey %{_kf5_libdir}/libKF5GuiAddons.so.* -%{_kf5_plugindir}/kf5/kguiaddons/kmodifierkey/kmodifierkey_xcb.so %{_kf5_debugdir}/kguiaddons.categories %files devel ++++++ kguiaddons-5.93.0.tar.xz -> kguiaddons-5.94.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.93.0/.gitlab-ci.yml new/kguiaddons-5.94.0/.gitlab-ci.yml --- old/kguiaddons-5.93.0/.gitlab-ci.yml 2022-04-02 11:59:14.000000000 +0200 +++ new/kguiaddons-5.94.0/.gitlab-ci.yml 2022-04-29 17:51:11.000000000 +0200 @@ -7,3 +7,4 @@ - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.93.0/.kde-ci.yml new/kguiaddons-5.94.0/.kde-ci.yml --- old/kguiaddons-5.93.0/.kde-ci.yml 2022-04-02 11:59:14.000000000 +0200 +++ new/kguiaddons-5.94.0/.kde-ci.yml 2022-04-29 17:51:11.000000000 +0200 @@ -3,6 +3,10 @@ 'require': 'frameworks/extra-cmake-modules': '@same' +- 'on': ['Linux', 'FreeBSD'] + 'require': + 'libraries/plasma-wayland-protocols': '@latest' + Options: test-before-installing: True - require-passing-tests-on: [ 'Linux', 'FreeBSD' ] + require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.93.0/CMakeLists.txt new/kguiaddons-5.94.0/CMakeLists.txt --- old/kguiaddons-5.93.0/CMakeLists.txt 2022-04-02 11:59:14.000000000 +0200 +++ new/kguiaddons-5.94.0/CMakeLists.txt 2022-04-29 17:51:11.000000000 +0200 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.93.0") # handled by release scripts +set(KF_VERSION "5.94.0") # handled by release scripts project(KGuiAddons VERSION ${KF_VERSION}) include(FeatureSummary) @@ -43,12 +43,11 @@ find_package(XCB REQUIRED MODULE COMPONENTS XCB) if (QT_MAJOR_VERSION STREQUAL "5") find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} CONFIG) -else() - # qtx11extras_p.h is in Qt6Gui, which is already found a couple of lines above endif() endif() if (WITH_WAYLAND) + find_package(PlasmaWaylandProtocols 1.7.0 REQUIRED) find_package(Qt${QT_MAJOR_VERSION}WaylandClient ${REQUIRED_QT_VERSION} CONFIG) # With Qt6 use qt_generate_wayland_protocol_client_sources instead of # ecm_add_qtwayland_client_protocol (in QtWaylandScanner from ECM) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.93.0/KF5GuiAddonsConfig.cmake.in new/kguiaddons-5.94.0/KF5GuiAddonsConfig.cmake.in --- old/kguiaddons-5.93.0/KF5GuiAddonsConfig.cmake.in 2022-04-02 11:59:14.000000000 +0200 +++ new/kguiaddons-5.94.0/KF5GuiAddonsConfig.cmake.in 2022-04-29 17:51:11.000000000 +0200 @@ -9,8 +9,6 @@ if (@WITH_X11@) if (NOT TARGET Qt6::Gui) find_dependency(Qt5X11Extras @REQUIRED_QT_VERSION@) - else() - # qtx11extras_p.h is in Qt6Gui which is a dependency anyway endif() endif() if (@WITH_WAYLAND@) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.93.0/src/CMakeLists.txt new/kguiaddons-5.94.0/src/CMakeLists.txt --- old/kguiaddons-5.93.0/src/CMakeLists.txt 2022-04-02 11:59:14.000000000 +0200 +++ new/kguiaddons-5.94.0/src/CMakeLists.txt 2022-04-29 17:51:11.000000000 +0200 @@ -1,3 +1,5 @@ +configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) + add_library(KF5GuiAddons) add_library(KF5::GuiAddons ALIAS KF5GuiAddons) @@ -41,6 +43,7 @@ FILES "${CMAKE_CURRENT_SOURCE_DIR}/recorder/keyboard-shortcuts-inhibit-unstable-v1.xml" "${CMAKE_CURRENT_SOURCE_DIR}/systemclipboard/wlr-data-control-unstable-v1.xml" + "${PLASMA_WAYLAND_PROTOCOLS_DIR}/keystate.xml" ) else() set(wayland_SRCS) @@ -52,6 +55,10 @@ PROTOCOL systemclipboard/wlr-data-control-unstable-v1.xml BASENAME wlr-data-control-unstable-v1 ) + ecm_add_qtwayland_client_protocol(wayland_SRCS + PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/keystate.xml + BASENAME keystate + ) target_sources(KF5GuiAddons PRIVATE ${wayland_SRCS} ) @@ -59,11 +66,20 @@ target_sources(KF5GuiAddons PRIVATE recorder/waylandinhibition.cpp systemclipboard/waylandclipboard.cpp + util/kmodifierkeyinfoprovider_wayland.cpp ) target_compile_definitions(KF5GuiAddons PRIVATE WITH_WAYLAND) target_link_libraries(KF5GuiAddons PRIVATE Qt${QT_MAJOR_VERSION}::GuiPrivate Qt${QT_MAJOR_VERSION}::WaylandClient Wayland::Client) endif() +if(WITH_X11) + target_sources(KF5GuiAddons PRIVATE util/kmodifierkeyinfoprovider_xcb.cpp) + if (TARGET Qt5::X11Extras) + target_link_libraries(KF5GuiAddons PRIVATE Qt5::X11Extras) + endif() + target_link_libraries(KF5GuiAddons PRIVATE X11::Xkb XCB::XCB) +endif() + generate_export_header(KF5GuiAddons BASE_NAME KGuiAddons) set(kguiaddons_INCLUDES @@ -79,15 +95,6 @@ target_compile_definitions(KF5GuiAddons INTERFACE "$<INSTALL_INTERFACE:KGUIADDONS_LIB>") target_link_libraries(KF5GuiAddons PUBLIC Qt${QT_MAJOR_VERSION}::Gui) -if (WITH_X11 AND (TARGET Qt5::X11Extras OR TARGET Qt6::Gui)) - add_library(kmodifierkey_xcb MODULE util/kmodifierkeyinfoprovider_xcb.cpp) - install(TARGETS kmodifierkey_xcb DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/kguiaddons/kmodifierkey/) - if (TARGET Qt5::X11Extras) - target_link_libraries(kmodifierkey_xcb PRIVATE Qt5::X11Extras) - endif() - target_link_libraries(kmodifierkey_xcb PRIVATE X11::Xkb XCB::XCB KF5::GuiAddons) -endif() - ecm_generate_headers(KGuiAddons_HEADERS HEADER_NAMES KColorUtils diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.93.0/src/config.h.in new/kguiaddons-5.94.0/src/config.h.in --- old/kguiaddons-5.93.0/src/config.h.in 1970-01-01 01:00:00.000000000 +0100 +++ new/kguiaddons-5.94.0/src/config.h.in 2022-04-29 17:51:11.000000000 +0200 @@ -0,0 +1,2 @@ +#cmakedefine01 WITH_X11 +#cmakedefine01 WITH_WAYLAND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.93.0/src/geo-scheme-handler/google-maps-geo-handler.desktop new/kguiaddons-5.94.0/src/geo-scheme-handler/google-maps-geo-handler.desktop --- old/kguiaddons-5.93.0/src/geo-scheme-handler/google-maps-geo-handler.desktop 2022-04-02 11:59:14.000000000 +0200 +++ new/kguiaddons-5.94.0/src/geo-scheme-handler/google-maps-geo-handler.desktop 2022-04-29 17:51:11.000000000 +0200 @@ -5,6 +5,7 @@ Name[ca]=Google Maps Name[ca@valencia]=Google Maps Name[cs]=Mapy Google +Name[de]=Google Maps Name[en_GB]=Google Maps Name[es]=Google Maps Name[fr]=Google Maps @@ -12,11 +13,13 @@ Name[it]=Mappe di Google Name[ko]=Google ?????? Name[nl]=Google Maps +Name[pl]=Mapy Google Name[pt]=Google Maps Name[ro]=H??r??i Google Name[sk]=Google Maps Name[sl]=Google Maps Name[sv]=Google kartor +Name[tr]=Google Haritalar Name[uk]=?????????? Google Name[x-test]=xxGoogle Mapsxx Name[zh_CN]=Google Maps diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.93.0/src/geo-scheme-handler/openstreetmap-geo-handler.desktop new/kguiaddons-5.94.0/src/geo-scheme-handler/openstreetmap-geo-handler.desktop --- old/kguiaddons-5.93.0/src/geo-scheme-handler/openstreetmap-geo-handler.desktop 2022-04-02 11:59:14.000000000 +0200 +++ new/kguiaddons-5.94.0/src/geo-scheme-handler/openstreetmap-geo-handler.desktop 2022-04-29 17:51:11.000000000 +0200 @@ -5,6 +5,7 @@ Name[ca]=OpenStreetMap Name[ca@valencia]=OpenStreetMap Name[cs]=OpenStreetMap +Name[de]=OpenStreetMap Name[en_GB]=OpenStreetMap Name[es]=OpenStreetMap Name[fr]=OpenStreetMap @@ -12,11 +13,13 @@ Name[it]=OpenStreetMap Name[ko]=OpenStreetMap Name[nl]=OpenStreetMap +Name[pl]=OpenStreetMap Name[pt]=OpenStreetMap Name[ro]=OpenStreetMap Name[sk]=OpenStreetMap Name[sl]=OpenStreetMap Name[sv]=OpenStreetMap +Name[tr]=OpenStreetMap Name[uk]=OpenStreetMap Name[x-test]=xxOpenStreetMapxx Name[zh_CN]=OpenStreetMap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.93.0/src/geo-scheme-handler/qwant-maps-geo-handler.desktop new/kguiaddons-5.94.0/src/geo-scheme-handler/qwant-maps-geo-handler.desktop --- old/kguiaddons-5.93.0/src/geo-scheme-handler/qwant-maps-geo-handler.desktop 2022-04-02 11:59:14.000000000 +0200 +++ new/kguiaddons-5.94.0/src/geo-scheme-handler/qwant-maps-geo-handler.desktop 2022-04-29 17:51:11.000000000 +0200 @@ -5,6 +5,7 @@ Name[ca]=Qwant Maps Name[ca@valencia]=Qwant Maps Name[cs]=Mapy Qwant +Name[de]=Qwant Maps Name[en_GB]=Qwant Maps Name[es]=Qwant Maps Name[fr]=Qwant Maps @@ -12,11 +13,13 @@ Name[it]=Qwant Maps Name[ko]=Qwant ?????? Name[nl]=Qwant Maps +Name[pl]=Mapy Qwant Name[pt]=Qwant Maps Name[ro]=H??r??i Qwant Name[sk]=Qwant Maps Name[sl]=Qwant Maps Name[sv]=Qwant kartor +Name[tr]=Qwant Haritalar Name[uk]=?????????? Qwant Name[x-test]=xxQwant Mapsxx Name[zh_CN]=Qwant Maps diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.93.0/src/geo-scheme-handler/wheelmap-geo-handler.desktop new/kguiaddons-5.94.0/src/geo-scheme-handler/wheelmap-geo-handler.desktop --- old/kguiaddons-5.93.0/src/geo-scheme-handler/wheelmap-geo-handler.desktop 2022-04-02 11:59:14.000000000 +0200 +++ new/kguiaddons-5.94.0/src/geo-scheme-handler/wheelmap-geo-handler.desktop 2022-04-29 17:51:11.000000000 +0200 @@ -5,6 +5,7 @@ Name[ca]=wheelmap.org Name[ca@valencia]=wheelmap.org Name[cs]=wheelmap.org +Name[de]=wheelmap.org Name[en_GB]=wheelmap.org Name[es]=wheelmap.org Name[fr]=wheelmap.org @@ -12,11 +13,13 @@ Name[it]=wheelmap.org Name[ko]=wheelmap.org Name[nl]=wheelmap.org +Name[pl]=wheelmap.org Name[pt]=wheelmap.org Name[ro]=wheelmap.org Name[sk]=wheelmap.org Name[sl]=wheelmap.org Name[sv]=wheelmap.org +Name[tr]=wheelmap.org Name[uk]=wheelmap.org Name[x-test]=xxwheelmap.orgxx Name[zh_CN]=wheelmap.org diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.93.0/src/util/kmodifierkeyinfo.cpp new/kguiaddons-5.94.0/src/util/kmodifierkeyinfo.cpp --- old/kguiaddons-5.93.0/src/util/kmodifierkeyinfo.cpp 2022-04-02 11:59:14.000000000 +0200 +++ new/kguiaddons-5.94.0/src/util/kmodifierkeyinfo.cpp 2022-04-29 17:51:11.000000000 +0200 @@ -9,17 +9,32 @@ #include <kguiaddons_debug.h> #include <QGuiApplication> -#include <QPluginLoader> + +#include "config.h" + +#if WITH_WAYLAND +#include "kmodifierkeyinfoprovider_wayland.h" +#endif + +#if WITH_X11 +#include "kmodifierkeyinfoprovider_xcb.h" +#endif KModifierKeyInfoProvider *createProvider() { - QPluginLoader loader(QStringLiteral("kf" QT_STRINGIFY(QT_VERSION_MAJOR)) + QStringLiteral("/kguiaddons/kmodifierkey/kmodifierkey_") - + qGuiApp->platformName()); - auto instance = dynamic_cast<KModifierKeyInfoProvider *>(loader.instance()); - if (instance) { - return instance; +#if WITH_WAYLAND + if (qGuiApp->platformName() == QLatin1String("wayland")) { + return new KModifierKeyInfoProviderWayland; } - qCWarning(KGUIADDONS_LOG) << "Error: could not load plugin for platform" << loader.fileName() << "error:" << loader.errorString() << loader.instance(); +#endif + +#if WITH_X11 + if (qGuiApp->platformName() == QLatin1String("xcb")) { + return new KModifierKeyInfoProviderXcb; + } +#endif + + qCWarning(KGUIADDONS_LOG) << "No modifierkeyinfo backend for platform" << qGuiApp->platformName(); return new KModifierKeyInfoProvider; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.93.0/src/util/kmodifierkeyinfoprovider_wayland.cpp new/kguiaddons-5.94.0/src/util/kmodifierkeyinfoprovider_wayland.cpp --- old/kguiaddons-5.93.0/src/util/kmodifierkeyinfoprovider_wayland.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kguiaddons-5.94.0/src/util/kmodifierkeyinfoprovider_wayland.cpp 2022-04-29 17:51:11.000000000 +0200 @@ -0,0 +1,92 @@ +/* + SPDX-FileCopyrightText: 2019 Aleix Pol Gonzalez <aleix...@kde.org> + SPDX-FileCopyrightText: 2022 Nicolas Fella <nicolas.fe...@gmx.de> + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL +*/ + +#include "kmodifierkeyinfoprovider_wayland.h" +#include <QDebug> + +#include <QtWaylandClient/qwaylandclientextension.h> + +#include "qwayland-keystate.h" + +class KeyState : public QWaylandClientExtensionTemplate<KeyState>, public QtWayland::org_kde_kwin_keystate +{ + Q_OBJECT +public: + KeyState() + : QWaylandClientExtensionTemplate<KeyState>(3) + { + } + + void org_kde_kwin_keystate_stateChanged(uint32_t key, uint32_t state) override + { + Q_EMIT stateChanged(toKey(static_cast<KeyState::key>(key)), toState(static_cast<KeyState::state>(state))); + } + + KModifierKeyInfoProvider::ModifierState toState(KeyState::state state) + { + switch (state) { + case KeyState::state::state_unlocked: + return KModifierKeyInfoProvider::Nothing; + case KeyState::state::state_locked: + return KModifierKeyInfoProvider::Locked; + case KeyState::state::state_latched: + return KModifierKeyInfoProvider::Latched; + } + Q_UNREACHABLE(); + return KModifierKeyInfoProvider::Nothing; + } + + Qt::Key toKey(KeyState::key key) + { + switch (key) { + case KeyState::key::key_capslock: + return Qt::Key_CapsLock; + case KeyState::key::key_numlock: + return Qt::Key_NumLock; + case KeyState::key::key_scrolllock: + return Qt::Key_ScrollLock; + } + Q_UNREACHABLE(); + return {}; + } + + Q_SIGNAL void stateChanged(Qt::Key key, KModifierKeyInfoProvider::ModifierState state); +}; + +KModifierKeyInfoProviderWayland::KModifierKeyInfoProviderWayland() +{ + m_keystate = new KeyState; + + QObject::connect(m_keystate, &KeyState::activeChanged, this, [this]() { + if (m_keystate->isActive()) { + m_keystate->fetchStates(); + } + }); + + connect(m_keystate, &KeyState::stateChanged, this, &KModifierKeyInfoProviderWayland::stateUpdated); + + stateUpdated(Qt::Key_CapsLock, KModifierKeyInfoProvider::Nothing); + stateUpdated(Qt::Key_NumLock, KModifierKeyInfoProvider::Nothing); + stateUpdated(Qt::Key_ScrollLock, KModifierKeyInfoProvider::Nothing); +} + +KModifierKeyInfoProviderWayland::~KModifierKeyInfoProviderWayland() +{ + delete m_keystate; +} + +bool KModifierKeyInfoProviderWayland::setKeyLatched(Qt::Key /*key*/, bool /*latched*/) +{ + return false; +} + +bool KModifierKeyInfoProviderWayland::setKeyLocked(Qt::Key /*key*/, bool /*locked*/) +{ + return false; +} + +#include "kmodifierkeyinfoprovider_wayland.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.93.0/src/util/kmodifierkeyinfoprovider_wayland.h new/kguiaddons-5.94.0/src/util/kmodifierkeyinfoprovider_wayland.h --- old/kguiaddons-5.93.0/src/util/kmodifierkeyinfoprovider_wayland.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kguiaddons-5.94.0/src/util/kmodifierkeyinfoprovider_wayland.h 2022-04-29 17:51:11.000000000 +0200 @@ -0,0 +1,29 @@ +/* + SPDX-FileCopyrightText: 2019 Aleix Pol Gonzalez <aleix...@kde.org> + SPDX-FileCopyrightText: 2022 Nicolas Fella <nicolas.fe...@gmx.de> + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL +*/ + +#ifndef KMODIFIERKEYINFOPROVIDERWAYLAND_H +#define KMODIFIERKEYINFOPROVIDERWAYLAND_H + +#include <kmodifierkeyinfoprovider_p.h> + +class KeyState; + +class KModifierKeyInfoProviderWayland : public KModifierKeyInfoProvider +{ + Q_OBJECT +public: + KModifierKeyInfoProviderWayland(); + ~KModifierKeyInfoProviderWayland(); + + bool setKeyLatched(Qt::Key key, bool latched) override; + bool setKeyLocked(Qt::Key key, bool locked) override; + +private: + KeyState *m_keystate; +}; + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.93.0/src/util/kmodifierkeyinfoprovider_xcb.h new/kguiaddons-5.94.0/src/util/kmodifierkeyinfoprovider_xcb.h --- old/kguiaddons-5.93.0/src/util/kmodifierkeyinfoprovider_xcb.h 2022-04-02 11:59:14.000000000 +0200 +++ new/kguiaddons-5.94.0/src/util/kmodifierkeyinfoprovider_xcb.h 2022-04-29 17:51:11.000000000 +0200 @@ -13,7 +13,6 @@ class KModifierKeyInfoProviderXcb : public KModifierKeyInfoProvider, public QAbstractNativeEventFilter { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.kde.kguiaddons.KModifierKeyInfoProvider.XCB") public: KModifierKeyInfoProviderXcb(); ~KModifierKeyInfoProviderXcb() override;
