Hello community, here is the log from the commit of package kglobalaccel for openSUSE:Factory checked in at 2019-11-12 11:46:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kglobalaccel (Old) and /work/SRC/openSUSE:Factory/.kglobalaccel.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kglobalaccel" Tue Nov 12 11:46:49 2019 rev:75 rq:747110 version:5.64.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kglobalaccel/kglobalaccel.changes 2019-10-14 13:35:45.234296339 +0200 +++ /work/SRC/openSUSE:Factory/.kglobalaccel.new.2990/kglobalaccel.changes 2019-11-12 11:46:58.842822587 +0100 @@ -1,0 +2,10 @@ +Sun Nov 3 15:47:00 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Update to 5.64.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.64.0.php +- Changes since 5.63.0: + * Use ECMGenerateExportHeader to manage deprecated API better + +------------------------------------------------------------------- Old: ---- kglobalaccel-5.63.0.tar.xz kglobalaccel-5.63.0.tar.xz.sig New: ---- kglobalaccel-5.64.0.tar.xz kglobalaccel-5.64.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kglobalaccel.spec ++++++ --- /var/tmp/diff_new_pack.oS0FUw/_old 2019-11-12 11:46:59.898823667 +0100 +++ /var/tmp/diff_new_pack.oS0FUw/_new 2019-11-12 11:46:59.902823671 +0100 @@ -17,14 +17,14 @@ %define lname libKF5GlobalAccel5 -%define _tar_path 5.63 +%define _tar_path 5.64 # 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}')} %bcond_without lang Name: kglobalaccel -Version: 5.63.0 +Version: 5.64.0 Release: 0 Summary: Global desktop keyboard shortcuts License: LGPL-2.1-or-later ++++++ kglobalaccel-5.63.0.tar.xz -> kglobalaccel-5.64.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.63.0/CMakeLists.txt new/kglobalaccel-5.64.0/CMakeLists.txt --- old/kglobalaccel-5.63.0/CMakeLists.txt 2019-10-06 11:45:36.000000000 +0200 +++ new/kglobalaccel-5.64.0/CMakeLists.txt 2019-11-02 13:55:50.000000000 +0100 @@ -1,29 +1,32 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.63.0") # handled by release scripts -set(KF5_DEP_VERSION "5.63.0") # handled by release scripts +set(KF5_VERSION "5.64.0") # handled by release scripts +set(KF5_DEP_VERSION "5.64.0") # handled by release scripts project(KGlobalAccel VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.63.0 NO_MODULE) +find_package(ECM 5.64.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) +include(KDEInstallDirs) +include(KDECMakeSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) -include(GenerateExportHeader) +include(ECMGenerateExportHeader) include(CMakePackageConfigHelpers) include(ECMSetupVersion) include(ECMGenerateHeaders) include(ECMAddQch) include(ECMMarkNonGuiExecutable) include(ECMQtDeclareLoggingCategory) - - include(ECMPoQmTools) +set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].") + option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") @@ -36,10 +39,6 @@ set(REQUIRED_QT_VERSION 5.11.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus Widgets) -include(KDEInstallDirs) -include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) -include(KDECMakeSettings) - # Dependencies of runtime component find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED) find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) @@ -65,6 +64,7 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) endif() add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) +add_definitions(-DQT_DEPRECATED_WARNINGS_SINCE=0x060000) # Subdirectories if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") ecm_install_po_files_as_qm(po) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.63.0/autotests/kglobalshortcuttest.cpp new/kglobalaccel-5.64.0/autotests/kglobalshortcuttest.cpp --- old/kglobalaccel-5.63.0/autotests/kglobalshortcuttest.cpp 2019-10-06 11:45:36.000000000 +0200 +++ new/kglobalaccel-5.64.0/autotests/kglobalshortcuttest.cpp 2019-11-02 13:55:50.000000000 +0100 @@ -104,8 +104,8 @@ } // Ensure that the previous test did cleanup correctly +#if KGLOBALACCEL_ENABLE_DEPRECATED_SINCE(4, 2) KGlobalAccel *kga = KGlobalAccel::self(); -#ifndef KGLOBALACCEL_NO_DEPRECATED QList<QStringList> components = kga->allMainComponents(); QStringList componentId; componentId << componentName << QString() << "KDE Test Program" << QString(); @@ -343,8 +343,8 @@ } // As in kdebase/workspace/kcontrol/keys/globalshortcuts.cpp +#if KGLOBALACCEL_ENABLE_DEPRECATED_SINCE(4, 2) KGlobalAccel *kga = KGlobalAccel::self(); -#ifndef KGLOBALACCEL_NO_DEPRECATED QList<QStringList> components = kga->allMainComponents(); //qDebug() << components; QStringList componentId; @@ -352,7 +352,7 @@ QVERIFY(components.contains(componentId)); #endif -#ifndef KGLOBALACCEL_NO_DEPRECATED +#if KGLOBALACCEL_ENABLE_DEPRECATED_SINCE(4, 2) QList<QStringList> actions = kga->allActionsForComponent(componentId); QVERIFY(!actions.isEmpty()); QStringList actionIdA; @@ -510,8 +510,8 @@ // kglobalaccel writes asynchronous. QThread::sleep(1); +#if KGLOBALACCEL_ENABLE_DEPRECATED_SINCE(4, 2) KGlobalAccel *kga = KGlobalAccel::self(); -#ifndef KGLOBALACCEL_NO_DEPRECATED QList<QStringList> components = kga->allMainComponents(); QStringList componentId; componentId << "qttest" << QString() << "KDE Test Program" << QString(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.63.0/docs/Doxyfile.local new/kglobalaccel-5.64.0/docs/Doxyfile.local --- old/kglobalaccel-5.63.0/docs/Doxyfile.local 1970-01-01 01:00:00.000000000 +0100 +++ new/kglobalaccel-5.64.0/docs/Doxyfile.local 2019-11-02 13:55:50.000000000 +0100 @@ -0,0 +1,7 @@ +### KApiDox Project-specific Overrides File + +# define so that deprecated API is not skipped +PREDEFINED += \ + "KGLOBALACCEL_ENABLE_DEPRECATED_SINCE(x, y)=1" \ + "KGLOBALACCEL_BUILD_DEPRECATED_SINCE(x, y)=1" \ + "KGLOBALACCEL_DEPRECATED_VERSION(x, y, t)=" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.63.0/po/gl/kglobalaccel5_qt.po new/kglobalaccel-5.64.0/po/gl/kglobalaccel5_qt.po --- old/kglobalaccel-5.63.0/po/gl/kglobalaccel5_qt.po 2019-10-06 11:45:36.000000000 +0200 +++ new/kglobalaccel-5.64.0/po/gl/kglobalaccel5_qt.po 2019-11-02 13:55:50.000000000 +0100 @@ -1,7 +1,6 @@ # translation of kdelibs4.po to galician # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# # mvillarino <[email protected]>, 2007, 2008, 2009. # Marce Villarino <[email protected]>, 2008, 2009. # marce villarino <[email protected]>, 2009. @@ -10,20 +9,22 @@ # Xosé <[email protected]>, 2010. # Marce Villarino <[email protected]>, 2011, 2012, 2013, 2014. # Adrián Chaves Fernández <[email protected]>, 2015. -# Adrian Chaves <[email protected]>, 2018. +# Adrian Chaves <[email protected]>, 2018, 2019. +# msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2018-04-28 21:34+0100\n" -"Last-Translator: Adrian Chaves <[email protected]>\n" -"Language-Team: Galician <[email protected]>\n" +"PO-Revision-Date: 2019-10-19 22:27+0200\n" +"Last-Translator: Adrián Chaves (Gallaecio) <[email protected]>\n" +"Language-Team: Galician <[email protected]>\n" "Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 19.11.70\n" "X-Qt-Contexts: true\n" #: kglobalaccel.cpp:554 @@ -52,7 +53,7 @@ msgctxt "KGlobalAccel|" msgid "The '%1' key combination is registered by application %2 for action %3:" msgstr "" -"A combinación de teclas «%1» está rexistrada polo aplicativo %2 para a " +"A combinación de teclas «%1» está rexistrada pola aplicación %2 para a " "acción %3:" #: kglobalaccel.cpp:592 @@ -68,7 +69,7 @@ "The '%1' key combination is registered by application %2.\n" "%3" msgstr "" -"A combinación de teclas «%1» está rexistrada polo aplicativo %2.\n" +"A combinación de teclas «%1» está rexistrada pola aplicación %2.\n" "%3" #: kglobalaccel.cpp:599 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.63.0/po/id/kglobalaccel5_qt.po new/kglobalaccel-5.64.0/po/id/kglobalaccel5_qt.po --- old/kglobalaccel-5.63.0/po/id/kglobalaccel5_qt.po 2019-10-06 11:45:36.000000000 +0200 +++ new/kglobalaccel-5.64.0/po/id/kglobalaccel5_qt.po 2019-11-02 13:55:50.000000000 +0100 @@ -17,7 +17,6 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 2.0\n" "X-Qt-Contexts: true\n" #: kglobalaccel.cpp:554 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.63.0/po/zh_CN/kglobalaccel5_qt.po new/kglobalaccel-5.64.0/po/zh_CN/kglobalaccel5_qt.po --- old/kglobalaccel-5.63.0/po/zh_CN/kglobalaccel5_qt.po 2019-10-06 11:45:36.000000000 +0200 +++ new/kglobalaccel-5.64.0/po/zh_CN/kglobalaccel5_qt.po 2019-11-02 13:55:50.000000000 +0100 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2019-09-05 09:24\n" +"PO-Revision-Date: 2019-10-09 09:44\n" "Last-Translator: Guo Yunhe (guoyunhe)\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.63.0/src/CMakeLists.txt new/kglobalaccel-5.64.0/src/CMakeLists.txt --- old/kglobalaccel-5.63.0/src/CMakeLists.txt 2019-10-06 11:45:36.000000000 +0200 +++ new/kglobalaccel-5.64.0/src/CMakeLists.txt 2019-11-02 13:55:50.000000000 +0100 @@ -20,8 +20,15 @@ install(FILES ${kglobalaccel_component_xml} DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} RENAME kf5_org.kde.kglobalaccel.Component.xml) add_library(KF5GlobalAccel ${kglobalaccel_SRCS}) -generate_export_header(KF5GlobalAccel BASE_NAME KGlobalAccel) add_library(KF5::GlobalAccel ALIAS KF5GlobalAccel) +ecm_generate_export_header(KF5GlobalAccel + BASE_NAME KGlobalAccel + GROUP_BASE_NAME KF + VERSION ${KF5_VERSION} + DEPRECATED_BASE_VERSION 0 + DEPRECATION_VERSIONS 4.2 4.4 5.9 + EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} +) target_include_directories(KF5GlobalAccel INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KGlobalAccel>") @@ -78,6 +85,7 @@ KGLOBALACCEL_EXPORT KGLOBALACCEL_DEPRECATED KGLOBALACCEL_DEPRECATED_EXPORT + "KGLOBALACCEL_DEPRECATED_VERSION(x, y, t)" TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} COMPONENT Devel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.63.0/src/kglobalaccel.cpp new/kglobalaccel-5.64.0/src/kglobalaccel.cpp --- old/kglobalaccel-5.63.0/src/kglobalaccel.cpp 2019-10-06 11:45:36.000000000 +0200 +++ new/kglobalaccel-5.64.0/src/kglobalaccel.cpp 2019-11-02 13:55:50.000000000 +0100 @@ -114,7 +114,7 @@ KGlobalAccelPrivate::KGlobalAccelPrivate(KGlobalAccel *q) : -#ifndef KGLOBALACCEL_NO_DEPRECATED +#if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 4) enabled(true), #endif q(q), @@ -192,7 +192,7 @@ return component->isActive(); } -#ifndef KGLOBALACCEL_NO_DEPRECATED +#if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 4) bool KGlobalAccel::isEnabled() const { return d->enabled; @@ -204,7 +204,7 @@ return d->getComponent(componentUnique); } -#ifndef KGLOBALACCEL_NO_DEPRECATED +#if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 4) void KGlobalAccel::setEnabled(bool enabled) { d->enabled = enabled; @@ -511,14 +511,14 @@ } } -#ifndef KGLOBALACCEL_NO_DEPRECATED +#if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 2) QList<QStringList> KGlobalAccel::allMainComponents() { return d->iface()->allMainComponents(); } #endif -#ifndef KGLOBALACCEL_NO_DEPRECATED +#if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 2) QList<QStringList> KGlobalAccel::allActionsForComponent(const QStringList &actionId) { return d->iface()->allActionsForComponent(actionId); @@ -526,7 +526,7 @@ #endif //static -#ifndef KGLOBALACCEL_NO_DEPRECATED +#if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 2) QStringList KGlobalAccel::findActionNameSystemwide(const QKeySequence &seq) { return self()->d->iface()->action(seq[0]); @@ -544,7 +544,7 @@ } //static -#ifndef KGLOBALACCEL_NO_DEPRECATED +#if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 2) bool KGlobalAccel::promptStealShortcutSystemwide(QWidget *parent, const QStringList &actionIdentifier, const QKeySequence &seq) { @@ -703,10 +703,12 @@ return d->actionShortcuts.contains(action) || d->actionDefaultShortcuts.contains(action); } +#if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(5, 9) bool KGlobalAccel::eventFilter(QObject *watched, QEvent *event) { return QObject::eventFilter(watched, event); } +#endif bool KGlobalAccel::setGlobalShortcut(QAction *action, const QList<QKeySequence> &shortcut) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.63.0/src/kglobalaccel.h new/kglobalaccel-5.64.0/src/kglobalaccel.h --- old/kglobalaccel-5.63.0/src/kglobalaccel.h 2019-10-06 11:45:36.000000000 +0200 +++ new/kglobalaccel-5.64.0/src/kglobalaccel.h 2019-11-02 13:55:50.000000000 +0100 @@ -289,66 +289,68 @@ */ bool hasShortcut(const QAction *action) const; +#if KGLOBALACCEL_ENABLE_DEPRECATED_SINCE(4, 4) /** * No effect. * - * @deprecated + * @deprecated Since 4.4. */ -#ifndef KGLOBALACCEL_NO_DEPRECATED - KGLOBALACCEL_DEPRECATED bool isEnabled() const; + KGLOBALACCEL_DEPRECATED_VERSION(4, 4, "Property no longer used") + bool isEnabled() const; #endif +#if KGLOBALACCEL_ENABLE_DEPRECATED_SINCE(4, 4) /** * No effect. * - * @deprecated + * @deprecated Since 4.4. */ -#ifndef KGLOBALACCEL_NO_DEPRECATED - KGLOBALACCEL_DEPRECATED void setEnabled(bool enabled); + KGLOBALACCEL_DEPRECATED_VERSION(4, 4, "Property no longer used") + void setEnabled(bool enabled); #endif +#if KGLOBALACCEL_ENABLE_DEPRECATED_SINCE(4, 2) /** * Return the unique and common names of all main components that have global shortcuts. * The action strings of the returned actionId stringlists will be empty. * - * @deprecated + * @deprecated Since 4.2. Do not use. */ -#ifndef KGLOBALACCEL_NO_DEPRECATED - KGLOBALACCEL_DEPRECATED QList<QStringList> allMainComponents(); + KGLOBALACCEL_DEPRECATED_VERSION(4, 2, "Do not use") + QList<QStringList> allMainComponents(); #endif +#if KGLOBALACCEL_ENABLE_DEPRECATED_SINCE(4, 2) /** - * @see getGlobalShortcutsByComponent - * - * @deprecated + * @deprecated Since 4.2. Do not use */ -#ifndef KGLOBALACCEL_NO_DEPRECATED - KGLOBALACCEL_DEPRECATED QList<QStringList> allActionsForComponent(const QStringList &actionId); + KGLOBALACCEL_DEPRECATED_VERSION(4, 2, "Do not use") + QList<QStringList> allActionsForComponent(const QStringList &actionId); #endif +#if KGLOBALACCEL_ENABLE_DEPRECATED_SINCE(4, 2) /** - * @see getGlobalShortcutsByKey - * - * @deprecated + * @deprecated Since 4.2, use KGlobalAccel::getGlobalShortcutsByKey(const QKeySequence &) */ -#ifndef KGLOBALACCEL_NO_DEPRECATED - KGLOBALACCEL_DEPRECATED static QStringList findActionNameSystemwide(const QKeySequence &seq); + KGLOBALACCEL_DEPRECATED_VERSION(4, 2, "Use KGlobalAccel::getGlobalShortcutsByKey(const QKeySequence &)") + static QStringList findActionNameSystemwide(const QKeySequence &seq); #endif +#if KGLOBALACCEL_ENABLE_DEPRECATED_SINCE(4, 2) /** - * @see promptStealShortcutSystemwide below - * - * @deprecated + * @deprecated Since 4.2, use KGlobalAccel::promptStealShortcutSystemwide(QWidget *, const QList<KGlobalShortcutInfo> &, const QKeySequence &) */ -#ifndef KGLOBALACCEL_NO_DEPRECATED - KGLOBALACCEL_DEPRECATED static bool promptStealShortcutSystemwide(QWidget *parent, const QStringList &actionIdentifier, const QKeySequence &seq); + KGLOBALACCEL_DEPRECATED_VERSION(4, 2, "Use KGlobalAccel::promptStealShortcutSystemwide(QWidget *, const QList<KGlobalShortcutInfo> &, const QKeySequence &)") + static bool promptStealShortcutSystemwide(QWidget *parent, const QStringList &actionIdentifier, const QKeySequence &seq); #endif +#if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(5, 9) /** - * TODO KF6 remove * @internal + * Override no longer needed, left for BIC */ bool eventFilter(QObject *watched, QEvent *event) override; +#endif Q_SIGNALS: /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.63.0/src/kglobalaccel_p.h new/kglobalaccel-5.64.0/src/kglobalaccel_p.h --- old/kglobalaccel-5.63.0/src/kglobalaccel_p.h 2019-10-06 11:45:36.000000000 +0200 +++ new/kglobalaccel-5.64.0/src/kglobalaccel_p.h 2019-11-02 13:55:50.000000000 +0100 @@ -84,7 +84,9 @@ QMultiHash<QString, QAction *> nameToAction; QSet<QAction *> actions; +#if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 4) bool enabled; +#endif org::kde::KGlobalAccel *iface(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.63.0/src/runtime/CMakeLists.txt new/kglobalaccel-5.64.0/src/runtime/CMakeLists.txt --- old/kglobalaccel-5.63.0/src/runtime/CMakeLists.txt 2019-10-06 11:45:36.000000000 +0200 +++ new/kglobalaccel-5.64.0/src/runtime/CMakeLists.txt 2019-11-02 13:55:50.000000000 +0100 @@ -19,8 +19,16 @@ configure_file(config-kglobalaccel.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kglobalaccel.h ) add_library(KF5GlobalAccelPrivate ${kglobalaccelprivate_SRCS}) -generate_export_header(KF5GlobalAccelPrivate BASE_NAME KF5GlobalAccelPrivate) add_library(KF5::GlobalAccelPrivate ALIAS KF5GlobalAccelPrivate) +ecm_generate_export_header(KF5GlobalAccelPrivate + EXPORT_FILE_NAME kf5globalaccelprivate_export.h + BASE_NAME KGlobalAccelPrivate + GROUP_BASE_NAME KF + VERSION ${KF5_VERSION} + DEPRECATED_BASE_VERSION 0 + DEPRECATION_VERSIONS 4.3 + EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} +) target_include_directories(KF5GlobalAccelPrivate INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KGlobalAccel>") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.63.0/src/runtime/kglobalaccel_interface.h new/kglobalaccel-5.64.0/src/runtime/kglobalaccel_interface.h --- old/kglobalaccel-5.63.0/src/runtime/kglobalaccel_interface.h 2019-10-06 11:45:36.000000000 +0200 +++ new/kglobalaccel-5.64.0/src/runtime/kglobalaccel_interface.h 2019-11-02 13:55:50.000000000 +0100 @@ -30,7 +30,7 @@ /** * Abstract interface for plugins to implement */ -class KF5GLOBALACCELPRIVATE_EXPORT KGlobalAccelInterface : public QObject +class KGLOBALACCELPRIVATE_EXPORT KGlobalAccelInterface : public QObject { Q_OBJECT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.63.0/src/runtime/kglobalacceld.cpp new/kglobalaccel-5.64.0/src/runtime/kglobalacceld.cpp --- old/kglobalaccel-5.63.0/src/runtime/kglobalacceld.cpp 2019-10-06 11:45:36.000000000 +0200 +++ new/kglobalaccel-5.64.0/src/runtime/kglobalacceld.cpp 2019-11-02 13:55:50.000000000 +0100 @@ -491,6 +491,7 @@ } +#if KGLOBALACCELPRIVATE_BUILD_DEPRECATED_SINCE(4, 3) void KGlobalAccelD::unRegister(const QStringList &actionId) { #ifdef KDEDGLOBALACCEL_TRACE @@ -505,7 +506,7 @@ } } - +#endif QList<int> KGlobalAccelD::setShortcut(const QStringList &actionId, const QList<int> &keys, uint flags) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.63.0/src/runtime/kglobalacceld.h new/kglobalaccel-5.64.0/src/runtime/kglobalacceld.h --- old/kglobalaccel-5.63.0/src/runtime/kglobalacceld.h 2019-10-06 11:45:36.000000000 +0200 +++ new/kglobalaccel-5.64.0/src/runtime/kglobalacceld.h 2019-11-02 13:55:50.000000000 +0100 @@ -35,7 +35,7 @@ /** * @todo get rid of all of those QStringList parameters. */ -class KF5GLOBALACCELPRIVATE_EXPORT KGlobalAccelD : public QObject, protected QDBusContext +class KGLOBALACCELPRIVATE_EXPORT KGlobalAccelD : public QObject, protected QDBusContext { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.kde.KGlobalAccel") @@ -100,8 +100,11 @@ Q_SCRIPTABLE void doRegister(const QStringList &actionId); - //! @see unregister - Q_SCRIPTABLE QT_DEPRECATED void unRegister(const QStringList &actionId); +#if KGLOBALACCELPRIVATE_ENABLE_DEPRECATED_SINCE(4, 3) + //! @deprecated Since 4.3, use KGlobalAccelD::unregister + KGLOBALACCELPRIVATE_DEPRECATED_VERSION(4, 3, "Use KGlobalAccelD::unregister(const QString&, const QString&") + Q_SCRIPTABLE void unRegister(const QStringList &actionId); +#endif Q_SCRIPTABLE void activateGlobalShortcutContext( const QString &component,
