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-01-11 21:16:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kguiaddons (Old) and /work/SRC/openSUSE:Factory/.kguiaddons.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kguiaddons" Tue Jan 11 21:16:20 2022 rev:98 rq:945056 version:5.90.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kguiaddons/kguiaddons.changes 2021-12-13 20:44:10.888483499 +0100 +++ /work/SRC/openSUSE:Factory/.kguiaddons.new.1892/kguiaddons.changes 2022-01-11 21:18:54.100943300 +0100 @@ -1,0 +2,16 @@ +Mon Jan 3 12:47:33 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 5.90.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.90.0 +- Changes since 5.89.0: + * Add KIconUtils::addOverlays() overload to allow passing QIcon and QStringList + * Fix CMake config file for Qt6 with X11 builds + * Compile with Qt 6.3 + * Use qt_generate_wayland_protocol_client_sources with Qt6 + * KSystemclipboard: add a nullcheck + * WIP: Change the build system to enable building with Qt 6 + * WaylandClipboard: Do not emit change upon the offer for our own source + +------------------------------------------------------------------- Old: ---- kguiaddons-5.89.0.tar.xz kguiaddons-5.89.0.tar.xz.sig New: ---- kguiaddons-5.90.0.tar.xz kguiaddons-5.90.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kguiaddons.spec ++++++ --- /var/tmp/diff_new_pack.3wDE19/_old 2022-01-11 21:18:54.840943820 +0100 +++ /var/tmp/diff_new_pack.3wDE19/_new 2022-01-11 21:18:54.844943823 +0100 @@ -17,22 +17,22 @@ %define lname libKF5GuiAddons5 -%define _tar_path 5.89 +%define _tar_path 5.90 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} # Only needed for the package signature condition -%bcond_without lang +%bcond_without released Name: kguiaddons -Version: 5.89.0 +Version: 5.90.0 Release: 0 Summary: Utilities for graphical user interfaces License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://www.kde.org Source: %{name}-%{version}.tar.xz -%if %{with lang} +%if %{with released} Source1: %{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif ++++++ kguiaddons-5.89.0.tar.xz -> kguiaddons-5.90.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.89.0/CMakeLists.txt new/kguiaddons-5.90.0/CMakeLists.txt --- old/kguiaddons-5.89.0/CMakeLists.txt 2021-12-04 18:00:02.000000000 +0100 +++ new/kguiaddons-5.90.0/CMakeLists.txt 2022-01-01 13:15:08.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.89.0") # handled by release scripts +set(KF_VERSION "5.90.0") # handled by release scripts project(KGuiAddons VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.89.0 NO_MODULE) +find_package(ECM 5.90.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -35,18 +35,26 @@ if (WITH_WAYLAND) set(_qtgui_find_components COMPONENTS Private) endif() -# QtGui must be found becore Qt5WaylandClient -find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE ${_qtgui_find_components}) +# QtGui must be found before Qt5WaylandClient +find_package(Qt${QT_MAJOR_VERSION}Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE ${_qtgui_find_components}) if (WITH_X11) find_package(X11 REQUIRED MODULE) find_package(XCB REQUIRED MODULE COMPONENTS XCB) - find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE) +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(Qt5WaylandClient ${REQUIRED_QT_VERSION} NO_MODULE) - find_package(QtWaylandScanner 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) + if (NOT TARGET Qt6::WaylandClient) + find_package(QtWaylandScanner REQUIRED) + endif() find_package(Wayland 1.9 REQUIRED Client) endif() @@ -100,7 +108,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kguiaddons_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.89.0/KF5GuiAddonsConfig.cmake.in new/kguiaddons-5.90.0/KF5GuiAddonsConfig.cmake.in --- old/kguiaddons-5.89.0/KF5GuiAddonsConfig.cmake.in 2021-12-04 18:00:02.000000000 +0100 +++ new/kguiaddons-5.90.0/KF5GuiAddonsConfig.cmake.in 2022-01-01 13:15:08.000000000 +0100 @@ -3,15 +3,19 @@ # Any changes in this file will be overwritten by CMake. include(CMakeFindDependencyMacro) -find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) +find_dependency(Qt@QT_MAJOR_VERSION@Gui @REQUIRED_QT_VERSION@) if (NOT @BUILD_SHARED_LIBS@) if (@WITH_X11@) - find_dependency(Qt5X11Extras @REQUIRED_QT_VERSION@) + 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@) find_dependency(Wayland REQUIRED Client) - find_dependency(Qt5WaylandClient @REQUIRED_QT_VERSION@) + find_dependency(Qt@QT_MAJOR_VERSION@WaylandClient @REQUIRED_QT_VERSION@) find_dependency(QtWaylandScanner) endif() endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.89.0/autotests/CMakeLists.txt new/kguiaddons-5.90.0/autotests/CMakeLists.txt --- old/kguiaddons-5.89.0/autotests/CMakeLists.txt 2021-12-04 18:00:02.000000000 +0100 +++ new/kguiaddons-5.90.0/autotests/CMakeLists.txt 2022-01-01 13:15:08.000000000 +0100 @@ -1,4 +1,4 @@ -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) remove_definitions(-DQT_NO_CAST_FROM_ASCII) @@ -11,5 +11,5 @@ kcursorsavertest.cpp keysequencerecordertest.cpp kurlhandlertest.cpp - LINK_LIBRARIES KF5::GuiAddons Qt5::Test + LINK_LIBRARIES KF5::GuiAddons Qt${QT_MAJOR_VERSION}::Test ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.89.0/src/CMakeLists.txt new/kguiaddons-5.90.0/src/CMakeLists.txt --- old/kguiaddons-5.89.0/src/CMakeLists.txt 2021-12-04 18:00:02.000000000 +0100 +++ new/kguiaddons-5.90.0/src/CMakeLists.txt 2022-01-01 13:15:08.000000000 +0100 @@ -36,22 +36,32 @@ ) if(WITH_WAYLAND) - set(wayland_SRCS) - ecm_add_qtwayland_client_protocol(wayland_SRCS - PROTOCOL recorder/keyboard-shortcuts-inhibit-unstable-v1.xml - BASENAME keyboard-shortcuts-inhibit-unstable-v1 - ) - ecm_add_qtwayland_client_protocol(wayland_SRCS - PROTOCOL systemclipboard/wlr-data-control-unstable-v1.xml - BASENAME wlr-data-control-unstable-v1 - ) + if (TARGET Qt6::WaylandClient) + qt_generate_wayland_protocol_client_sources(KF5GuiAddons + FILES + "${CMAKE_CURRENT_SOURCE_DIR}/recorder/keyboard-shortcuts-inhibit-unstable-v1.xml" + "${CMAKE_CURRENT_SOURCE_DIR}/systemclipboard/wlr-data-control-unstable-v1.xml" + ) + else() + set(wayland_SRCS) + ecm_add_qtwayland_client_protocol(wayland_SRCS + PROTOCOL recorder/keyboard-shortcuts-inhibit-unstable-v1.xml + BASENAME keyboard-shortcuts-inhibit-unstable-v1 + ) + ecm_add_qtwayland_client_protocol(wayland_SRCS + PROTOCOL systemclipboard/wlr-data-control-unstable-v1.xml + BASENAME wlr-data-control-unstable-v1 + ) + target_sources(KF5GuiAddons PRIVATE + ${wayland_SRCS} + ) + endif() target_sources(KF5GuiAddons PRIVATE recorder/waylandinhibition.cpp systemclipboard/waylandclipboard.cpp - ${wayland_SRCS} ) target_compile_definitions(KF5GuiAddons PRIVATE WITH_WAYLAND) - target_link_libraries(KF5GuiAddons PRIVATE Qt5::GuiPrivate Qt5::WaylandClient Wayland::Client) + target_link_libraries(KF5GuiAddons PRIVATE Qt${QT_MAJOR_VERSION}::GuiPrivate Qt${QT_MAJOR_VERSION}::WaylandClient Wayland::Client) endif() generate_export_header(KF5GuiAddons BASE_NAME KGuiAddons) @@ -65,14 +75,20 @@ ${CMAKE_CURRENT_SOURCE_DIR}/systemclipboard ) target_include_directories(KF5GuiAddons PUBLIC "$<BUILD_INTERFACE:${kguiaddons_INCLUDES}>") -target_include_directories(KF5GuiAddons INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KGuiAddons>" ) +target_include_directories(KF5GuiAddons INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KGuiAddons>" ) target_compile_definitions(KF5GuiAddons INTERFACE "$<INSTALL_INTERFACE:KGUIADDONS_LIB>") -target_link_libraries(KF5GuiAddons PUBLIC Qt5::Gui) +target_link_libraries(KF5GuiAddons PUBLIC Qt${QT_MAJOR_VERSION}::Gui) -if (WITH_X11) +if (WITH_X11 AND (TARGET Qt5::X11Extras OR TARGET Qt6::Gui)) add_library(kmodifierkey_xcb MODULE util/kmodifierkeyinfoprovider_xcb.cpp) - target_link_libraries(kmodifierkey_xcb PRIVATE X11::Xkb XCB::XCB Qt5::X11Extras KF5::GuiAddons) - install( TARGETS kmodifierkey_xcb DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kguiaddons/kmodifierkey/) + install(TARGETS kmodifierkey_xcb DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kguiaddons/kmodifierkey/) + + if (TARGET Qt5::X11Extras) + set(_qt_x11_libs Qt5::X11Extras) + elseif (TARGET Qt6::Gui) + set(_qt_x11_libs Qt6::GuiPrivate) # qtx11extras_p.h + endif() + target_link_libraries(kmodifierkey_xcb PRIVATE X11::Xkb XCB::XCB KF5::GuiAddons ${_qt_x11_libs}) endif() ecm_generate_headers(KGuiAddons_HEADERS @@ -156,7 +172,7 @@ util/kmodifierkeyinfoprovider_p.h util/klocalimagecacheimpl.h # implementation detail, no forwarding header ${KGuiAddons_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KGuiAddons COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KGuiAddons COMPONENT Devel ) if(BUILD_QCH) @@ -183,7 +199,7 @@ endif() include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME KGuiAddons LIB_NAME KF5GuiAddons DEPS "gui" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KGuiAddons) +ecm_generate_pri_file(BASE_NAME KGuiAddons LIB_NAME KF5GuiAddons DEPS "gui" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KGuiAddons) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) ecm_qt_install_logging_categories( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.89.0/src/systemclipboard/ksystemclipboard.cpp new/kguiaddons-5.90.0/src/systemclipboard/ksystemclipboard.cpp --- old/kguiaddons-5.89.0/src/systemclipboard/ksystemclipboard.cpp 2021-12-04 18:00:02.000000000 +0100 +++ new/kguiaddons-5.90.0/src/systemclipboard/ksystemclipboard.cpp 2022-01-01 13:15:08.000000000 +0100 @@ -46,7 +46,10 @@ QString KSystemClipboard::text(QClipboard::Mode mode) { const QMimeData *data = mimeData(mode); - return data->text(); + if (data) { + return data->text(); + } + return QString(); } KSystemClipboard::KSystemClipboard(QObject *parent) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.89.0/src/systemclipboard/waylandclipboard.cpp new/kguiaddons-5.90.0/src/systemclipboard/waylandclipboard.cpp --- old/kguiaddons-5.89.0/src/systemclipboard/waylandclipboard.cpp 2021-12-04 18:00:02.000000000 +0100 +++ new/kguiaddons-5.90.0/src/systemclipboard/waylandclipboard.cpp 2022-01-01 13:15:08.000000000 +0100 @@ -153,7 +153,11 @@ m_receivedFormats << mime_type; } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + QVariant retrieveData(const QString &mimeType, QMetaType type) const override; +#else QVariant retrieveData(const QString &mimeType, QVariant::Type type) const override; +#endif private: /** reads data from a file descriptor with a timeout of 1 second @@ -163,7 +167,11 @@ QStringList m_receivedFormats; }; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +QVariant DataControlOffer::retrieveData(const QString &mimeType, QMetaType type) const +#else QVariant DataControlOffer::retrieveData(const QString &mimeType, QVariant::Type type) const +#endif { Q_UNUSED(type); @@ -269,7 +277,7 @@ Q_OBJECT public: DataControlSource(struct ::zwlr_data_control_source_v1 *id, QMimeData *mimeData); - DataControlSource(); + DataControlSource() = default; ~DataControlSource() { destroy(); @@ -479,14 +487,20 @@ m_device.reset(new DataControlDevice(m_manager->get_data_device(seat))); connect(m_device.get(), &DataControlDevice::receivedSelectionChanged, this, [this]() { - Q_EMIT changed(QClipboard::Clipboard); + // When our source is still valid, so the offer is for setting it or we emit changed when it is cancelled + if (!m_device->selection()) { + Q_EMIT changed(QClipboard::Clipboard); + } }); connect(m_device.get(), &DataControlDevice::selectionChanged, this, [this]() { Q_EMIT changed(QClipboard::Clipboard); }); connect(m_device.get(), &DataControlDevice::receivedPrimarySelectionChanged, this, [this]() { - Q_EMIT changed(QClipboard::Selection); + // When our source is still valid, so the offer is for setting it or we emit changed when it is cancelled + if (!m_device->primarySelection()) { + Q_EMIT changed(QClipboard::Selection); + } }); connect(m_device.get(), &DataControlDevice::primarySelectionChanged, this, [this]() { Q_EMIT changed(QClipboard::Selection); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.89.0/src/util/kiconutils.cpp new/kguiaddons-5.90.0/src/util/kiconutils.cpp --- old/kguiaddons-5.89.0/src/util/kiconutils.cpp 2021-12-04 18:00:02.000000000 +0100 +++ new/kguiaddons-5.90.0/src/util/kiconutils.cpp 2022-01-01 13:15:08.000000000 +0100 @@ -4,6 +4,8 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ +#include <array> + #include "kiconutils.h" #include <QHash> @@ -15,6 +17,7 @@ public: KOverlayIconEngine(const QIcon &icon, const QIcon &overlay, Qt::Corner position); KOverlayIconEngine(const QIcon &icon, const QHash<Qt::Corner, QIcon> &overlays); + KOverlayIconEngine(const QIcon &icon, const QStringList &overlays); void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state) override; QIconEngine *clone() const override; @@ -43,6 +46,27 @@ m_overlays = overlays; } +KOverlayIconEngine::KOverlayIconEngine(const QIcon &icon, const QStringList &overlays) + : QIconEngine() + , m_base(icon) +{ + const std::array<Qt::Corner, 4> indexToCorner{ + Qt::BottomRightCorner, + Qt::BottomLeftCorner, + Qt::TopLeftCorner, + Qt::TopRightCorner, + }; + + // static_cast becaue size() returns a qsizetype in Qt6 + const int count = std::min(4, static_cast<int>(overlays.size())); + + m_overlays.reserve(count); + + for (int i = 0; i < count; i++) { + m_overlays.insert(indexToCorner[i], QIcon::fromTheme(overlays.at(i))); + } +} + QIconEngine *KOverlayIconEngine::clone() const { return new KOverlayIconEngine(*this); @@ -148,33 +172,23 @@ return QIcon(new KOverlayIconEngine(icon, overlays)); } -QIcon addOverlays(const QString &iconName, const QStringList &overlays) +QIcon addOverlays(const QIcon &icon, const QStringList &overlays) { - const int count = overlays.size(); - const QIcon icon = QIcon::fromTheme(iconName); - if (count == 0) { + if (overlays.count() == 0) { return icon; } - QHash<Qt::Corner, QIcon> overlaysHash; - overlaysHash.reserve(count); - - if (count >= 1) { - overlaysHash.insert(Qt::BottomRightCorner, QIcon::fromTheme(overlays.at(0))); - } - - if (count >= 2) { - overlaysHash.insert(Qt::BottomLeftCorner, QIcon::fromTheme(overlays.at(1))); - } + return QIcon(new KOverlayIconEngine(icon, overlays)); +} - if (count >= 3) { - overlaysHash.insert(Qt::TopLeftCorner, QIcon::fromTheme(overlays.at(2))); - } +QIcon addOverlays(const QString &iconName, const QStringList &overlays) +{ + const QIcon icon = QIcon::fromTheme(iconName); - if (count >= 4) { - overlaysHash.insert(Qt::TopRightCorner, QIcon::fromTheme(overlays.at(3))); + if (overlays.count() == 0) { + return icon; } - return QIcon(new KOverlayIconEngine(icon, overlaysHash)); + return QIcon(new KOverlayIconEngine(icon, overlays)); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.89.0/src/util/kiconutils.h new/kguiaddons-5.90.0/src/util/kiconutils.h --- old/kguiaddons-5.89.0/src/util/kiconutils.h 2021-12-04 18:00:02.000000000 +0100 +++ new/kguiaddons-5.90.0/src/util/kiconutils.h 2022-01-01 13:15:08.000000000 +0100 @@ -38,6 +38,24 @@ KGUIADDONS_EXPORT QIcon addOverlays(const QIcon &icon, const QHash<Qt::Corner, QIcon> &overlays); /** + * Adds up to four overlays over the @p icon. + * + * The @p overlays is a QStringList of icon names (e.g. the emblems that are drawn on + * icons in Dolphin and KFileWidget, e.g. symlink, un-mounted device ...etc). + * + * Overlays are added in this order: + * - first icon is used to paint an overlay on the bottom-right corner + * - second icon on the bottom-left corner + * - third icon on the top-left corner + * - fourth icon on the top-right corner + * + * Each overlay icon is scaled down to 1/3 or 1/4 (depending on the icon size). + * + * @since 5.90 + */ +KGUIADDONS_EXPORT QIcon addOverlays(const QIcon &icon, const QStringList &overlays); + +/** * Adds up to four overlays on the icon constructed from @p iconName. * * The @p overlays is a QStringList of icon names (e.g. the emblems that are drawn on diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.89.0/src/util/kmodifierkeyinfoprovider_xcb.cpp new/kguiaddons-5.90.0/src/util/kmodifierkeyinfoprovider_xcb.cpp --- old/kguiaddons-5.89.0/src/util/kmodifierkeyinfoprovider_xcb.cpp 2021-12-04 18:00:02.000000000 +0100 +++ new/kguiaddons-5.90.0/src/util/kmodifierkeyinfoprovider_xcb.cpp 2022-01-01 13:15:08.000000000 +0100 @@ -9,7 +9,11 @@ #include "kmodifierkeyinfo.h" #include <QGuiApplication> +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +#include <private/qtx11extras_p.h> +#else #include <QX11Info> +#endif #define XK_MISCELLANY #define XK_XKB_KEYS @@ -200,9 +204,12 @@ } _xkb_event; } -bool KModifierKeyInfoProviderXcb::nativeEventFilter(const QByteArray &eventType, void *message, long int *result) +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +bool KModifierKeyInfoProviderXcb::nativeEventFilter(const QByteArray &eventType, void *message, qintptr *) +#else +bool KModifierKeyInfoProviderXcb::nativeEventFilter(const QByteArray &eventType, void *message, long *) +#endif { - Q_UNUSED(result) if (!m_xkbAvailable || eventType != "xcb_generic_event_t") { return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.89.0/src/util/kmodifierkeyinfoprovider_xcb.h new/kguiaddons-5.90.0/src/util/kmodifierkeyinfoprovider_xcb.h --- old/kguiaddons-5.89.0/src/util/kmodifierkeyinfoprovider_xcb.h 2021-12-04 18:00:02.000000000 +0100 +++ new/kguiaddons-5.90.0/src/util/kmodifierkeyinfoprovider_xcb.h 2022-01-01 13:15:08.000000000 +0100 @@ -21,7 +21,11 @@ bool setKeyLatched(Qt::Key key, bool latched) override; bool setKeyLocked(Qt::Key key, bool locked) override; - bool nativeEventFilter(const QByteArray &eventType, void *message, long int *result) override; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *) override; +#else + bool nativeEventFilter(const QByteArray &eventType, void *message, long *) override; +#endif void xkbUpdateModifierMapping(); void xkbModifierStateChanged(unsigned char mods, unsigned char latched_mods, unsigned char locked_mods); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.89.0/tests/CMakeLists.txt new/kguiaddons-5.90.0/tests/CMakeLists.txt --- old/kguiaddons-5.89.0/tests/CMakeLists.txt 2021-12-04 18:00:02.000000000 +0100 +++ new/kguiaddons-5.90.0/tests/CMakeLists.txt 2022-01-01 13:15:08.000000000 +0100 @@ -3,12 +3,12 @@ include(ECMMarkAsTest) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test Widgets) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test Widgets) macro(kguiaddons_executable_tests) foreach(_testname ${ARGN}) add_executable(${_testname} ${_testname}.cpp) - target_link_libraries(${_testname} Qt5::Widgets KF5::GuiAddons) + target_link_libraries(${_testname} Qt${QT_MAJOR_VERSION}::Widgets KF5::GuiAddons) ecm_mark_as_test(${_testname}) endforeach(_testname) endmacro()
