Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package kglobalaccel for openSUSE:Factory 
checked in at 2021-02-17 18:10:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kglobalaccel (Old)
 and      /work/SRC/openSUSE:Factory/.kglobalaccel.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kglobalaccel"

Wed Feb 17 18:10:50 2021 rev:91 rq:871694 version:5.79.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/kglobalaccel/kglobalaccel.changes        
2021-01-13 18:17:42.701070156 +0100
+++ /work/SRC/openSUSE:Factory/.kglobalaccel.new.28504/kglobalaccel.changes     
2021-02-17 18:12:01.177964147 +0100
@@ -1,0 +2,9 @@
+Mon Feb  8 08:46:19 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr>
+
+- Update to 5.79.0
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/kde-frameworks-5.79.0
+- No code change since 5.78.0
+
+-------------------------------------------------------------------

Old:
----
  kglobalaccel-5.78.0.tar.xz
  kglobalaccel-5.78.0.tar.xz.sig

New:
----
  kglobalaccel-5.79.0.tar.xz
  kglobalaccel-5.79.0.tar.xz.sig

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kglobalaccel.spec ++++++
--- /var/tmp/diff_new_pack.SynKJD/_old  2021-02-17 18:12:01.729964599 +0100
+++ /var/tmp/diff_new_pack.SynKJD/_new  2021-02-17 18:12:01.733964602 +0100
@@ -17,14 +17,14 @@
 
 
 %define lname   libKF5GlobalAccel5
-%define _tar_path 5.78
+%define _tar_path 5.79
 # 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.78.0
+Version:        5.79.0
 Release:        0
 Summary:        Global desktop keyboard shortcuts
 License:        LGPL-2.1-or-later


++++++ kglobalaccel-5.78.0.tar.xz -> kglobalaccel-5.79.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kglobalaccel-5.78.0/.gitignore 
new/kglobalaccel-5.79.0/.gitignore
--- old/kglobalaccel-5.78.0/.gitignore  2021-01-02 14:14:45.000000000 +0100
+++ new/kglobalaccel-5.79.0/.gitignore  2021-02-06 19:16:39.000000000 +0100
@@ -20,3 +20,4 @@
 CMakeLists.txt.user*
 *.unc-backup*
 .cmake/
+/.clang-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kglobalaccel-5.78.0/CMakeLists.txt 
new/kglobalaccel-5.79.0/CMakeLists.txt
--- old/kglobalaccel-5.78.0/CMakeLists.txt      2021-01-02 14:14:45.000000000 
+0100
+++ new/kglobalaccel-5.79.0/CMakeLists.txt      2021-02-06 19:16:39.000000000 
+0100
@@ -1,12 +1,12 @@
 cmake_minimum_required(VERSION 3.5)
 
-set(KF5_VERSION "5.78.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.78.0") # handled by release scripts
-project(KGlobalAccel VERSION ${KF5_VERSION})
+set(KF_VERSION "5.79.0") # handled by release scripts
+set(KF_DEP_VERSION "5.79.0") # handled by release scripts
+project(KGlobalAccel VERSION ${KF_VERSION})
 
 # ECM setup
 include(FeatureSummary)
-find_package(ECM 5.78.0  NO_MODULE)
+find_package(ECM 5.79.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)
 
@@ -40,11 +40,11 @@
 find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus Widgets)
 
 # Dependencies of runtime component
-find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
-find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
-find_package(KF5Crash ${KF5_DEP_VERSION} REQUIRED)
-find_package(KF5DBusAddons ${KF5_DEP_VERSION} REQUIRED)
-find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED)
+find_package(KF5Config ${KF_DEP_VERSION} REQUIRED)
+find_package(KF5CoreAddons ${KF_DEP_VERSION} REQUIRED)
+find_package(KF5Crash ${KF_DEP_VERSION} REQUIRED)
+find_package(KF5DBusAddons ${KF_DEP_VERSION} REQUIRED)
+find_package(KF5WindowSystem ${KF_DEP_VERSION} REQUIRED)
 
 # no X11 stuff on mac
 if (NOT APPLE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kglobalaccel-5.78.0/po/nb/kglobalaccel5_qt.po 
new/kglobalaccel-5.79.0/po/nb/kglobalaccel5_qt.po
--- old/kglobalaccel-5.78.0/po/nb/kglobalaccel5_qt.po   2021-01-02 
14:14:45.000000000 +0100
+++ new/kglobalaccel-5.79.0/po/nb/kglobalaccel5_qt.po   2021-02-06 
19:16:39.000000000 +0100
@@ -26,12 +26,12 @@
 "X-Text-Markup: qtrich\n"
 "X-Qt-Contexts: true\n"
 
-#: kglobalaccel.cpp:542
+#: kglobalaccel.cpp:564
 msgctxt "KGlobalAccel|"
 msgid "Conflict with Global Shortcut"
 msgstr "Konflikt med global snarvei"
 
-#: kglobalaccel.cpp:543
+#: kglobalaccel.cpp:565
 #, qt-format
 msgctxt "KGlobalAccel|"
 msgid ""
@@ -43,12 +43,12 @@
 "i??%3.\n"
 "Vil du bruke kombinasjonen til den nye handlinga i stedet?"
 
-#: kglobalaccel.cpp:553 kglobalaccel.cpp:592
+#: kglobalaccel.cpp:575 kglobalaccel.cpp:614
 msgctxt "KGlobalAccel|"
 msgid "Reassign"
 msgstr "Tilordne p?? nytt"
 
-#: kglobalaccel.cpp:575
+#: kglobalaccel.cpp:597
 #, qt-format
 msgctxt "KGlobalAccel|"
 msgid "The '%1' key combination is registered by application %2 for action %3:"
@@ -56,13 +56,13 @@
 "Tastekombinasjonen ??%1?? er allerede registrert av programmet %2 for "
 "handling??%3:"
 
-#: kglobalaccel.cpp:580
+#: kglobalaccel.cpp:602
 #, qt-format
 msgctxt "KGlobalAccel|"
 msgid "In context '%1' for action '%2'\n"
 msgstr "I konteksten ??%1?? for handling ??%2??\n"
 
-#: kglobalaccel.cpp:583
+#: kglobalaccel.cpp:605
 #, qt-format
 msgctxt "KGlobalAccel|"
 msgid ""
@@ -72,7 +72,7 @@
 "Tastekombinasjonen ??%1?? er registrert av programmet %2.\n"
 "%3"
 
-#: kglobalaccel.cpp:587
+#: kglobalaccel.cpp:609
 msgctxt "KGlobalAccel|"
 msgid "Conflict With Registered Global Shortcut"
 msgstr "Konflikt med registrert global snarvei"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kglobalaccel-5.78.0/po/nn/kglobalaccel5_qt.po 
new/kglobalaccel-5.79.0/po/nn/kglobalaccel5_qt.po
--- old/kglobalaccel-5.78.0/po/nn/kglobalaccel5_qt.po   2021-01-02 
14:14:45.000000000 +0100
+++ new/kglobalaccel-5.79.0/po/nn/kglobalaccel5_qt.po   2021-02-06 
19:16:39.000000000 +0100
@@ -23,12 +23,12 @@
 "X-Text-Markup: qtrich\n"
 "X-Qt-Contexts: true\n"
 
-#: kglobalaccel.cpp:542
+#: kglobalaccel.cpp:564
 msgctxt "KGlobalAccel|"
 msgid "Conflict with Global Shortcut"
 msgstr "Konflikt med globale snarvegar"
 
-#: kglobalaccel.cpp:543
+#: kglobalaccel.cpp:565
 #, qt-format
 msgctxt "KGlobalAccel|"
 msgid ""
@@ -39,25 +39,25 @@
 "Tastekombinasjonen ??%1?? er alt i bruk for den globale handlinga ??%2?? i 
%3.\n"
 "Vil du bruka han til den nye handlinga i staden?"
 
-#: kglobalaccel.cpp:553 kglobalaccel.cpp:592
+#: kglobalaccel.cpp:575 kglobalaccel.cpp:614
 msgctxt "KGlobalAccel|"
 msgid "Reassign"
 msgstr "Tilordna p?? nytt"
 
-#: kglobalaccel.cpp:575
+#: kglobalaccel.cpp:597
 #, qt-format
 msgctxt "KGlobalAccel|"
 msgid "The '%1' key combination is registered by application %2 for action %3:"
 msgstr ""
 "Tastekombinasjonen ??%1?? er alt i bruk av programmet %2 til handlinga %3:"
 
-#: kglobalaccel.cpp:580
+#: kglobalaccel.cpp:602
 #, qt-format
 msgctxt "KGlobalAccel|"
 msgid "In context '%1' for action '%2'\n"
 msgstr "I samanhengen ??%1?? for handlinga ??%2??\n"
 
-#: kglobalaccel.cpp:583
+#: kglobalaccel.cpp:605
 #, qt-format
 msgctxt "KGlobalAccel|"
 msgid ""
@@ -67,7 +67,7 @@
 "Tastekombinasjonen ??%1?? er registrert av programmet %2.\n"
 "%3"
 
-#: kglobalaccel.cpp:587
+#: kglobalaccel.cpp:609
 msgctxt "KGlobalAccel|"
 msgid "Conflict With Registered Global Shortcut"
 msgstr "Konflikt med registrert global snarveg"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kglobalaccel-5.78.0/po/se/kglobalaccel5_qt.po 
new/kglobalaccel-5.79.0/po/se/kglobalaccel5_qt.po
--- old/kglobalaccel-5.78.0/po/se/kglobalaccel5_qt.po   2021-01-02 
14:14:45.000000000 +0100
+++ new/kglobalaccel-5.79.0/po/se/kglobalaccel5_qt.po   2021-02-06 
19:16:39.000000000 +0100
@@ -20,13 +20,13 @@
 "X-Text-Markup: qtrich\n"
 "X-Qt-Contexts: true\n"
 
-#: kglobalaccel.cpp:542
+#: kglobalaccel.cpp:564
 #, fuzzy
 msgctxt "KGlobalAccel|"
 msgid "Conflict with Global Shortcut"
 msgstr "G??vdno juo glob??la njuolggob??lggisin"
 
-#: kglobalaccel.cpp:543
+#: kglobalaccel.cpp:565
 #, fuzzy, qt-format
 msgctxt "KGlobalAccel|"
 msgid ""
@@ -37,25 +37,25 @@
 "??%1?? boallokombina??uvdna geavahuvvo juo almmola?? ??%2?? doibmii 
??%3:s??.\n"
 "H??liidatgo liikk?? bidjat dan kombina??uvnna dan o????a doibmii?"
 
-#: kglobalaccel.cpp:553 kglobalaccel.cpp:592
+#: kglobalaccel.cpp:575 kglobalaccel.cpp:614
 #, fuzzy
 msgctxt "KGlobalAccel|"
 msgid "Reassign"
 msgstr "Bija o????asit"
 
-#: kglobalaccel.cpp:575
+#: kglobalaccel.cpp:597
 #, fuzzy, qt-format
 msgctxt "KGlobalAccel|"
 msgid "The '%1' key combination is registered by application %2 for action %3:"
 msgstr "??%1??-boallokombina??uvdna geavahuvvo %2-progr??mmas %3-doaimmas:"
 
-#: kglobalaccel.cpp:580
+#: kglobalaccel.cpp:602
 #, fuzzy, qt-format
 msgctxt "KGlobalAccel|"
 msgid "In context '%1' for action '%2'\n"
 msgstr "??%1??-oktavuo??as ??%2??-doibmii\n"
 
-#: kglobalaccel.cpp:583
+#: kglobalaccel.cpp:605
 #, fuzzy, qt-format
 msgctxt "KGlobalAccel|"
 msgid ""
@@ -65,7 +65,7 @@
 "??%1??-boallokombina??uvdna geavahuvvo %2-progr??mmas.\n"
 "%3"
 
-#: kglobalaccel.cpp:587
+#: kglobalaccel.cpp:609
 #, fuzzy
 msgctxt "KGlobalAccel|"
 msgid "Conflict With Registered Global Shortcut"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kglobalaccel-5.78.0/po/zh_CN/kglobalaccel5_qt.po 
new/kglobalaccel-5.79.0/po/zh_CN/kglobalaccel5_qt.po
--- old/kglobalaccel-5.78.0/po/zh_CN/kglobalaccel5_qt.po        2021-01-02 
14:14:45.000000000 +0100
+++ new/kglobalaccel-5.79.0/po/zh_CN/kglobalaccel5_qt.po        2021-02-06 
19:16:39.000000000 +0100
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdeorg\n"
-"PO-Revision-Date: 2021-01-01 14:21\n"
+"PO-Revision-Date: 2021-02-04 11:58\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
@@ -40,25 +40,25 @@
 "\"%2\" in %3.\n"
 "Do you want to reassign it from that action to the current one?"
 msgstr ""
-"???????????????%1????????????????????????%3?????????????????????%2??????\n"
-"??????????????????????????????????????????????????????"
+"??????/???????????????%1?????????????????????%3?????????????????????%2??????\n"
+"?????????????????????/???????????????????????????????????????"
 
 #: kglobalaccel.cpp:575 kglobalaccel.cpp:614
 msgctxt "KGlobalAccel|"
 msgid "Reassign"
-msgstr "????????????"
+msgstr "????????????"
 
 #: kglobalaccel.cpp:597
 #, qt-format
 msgctxt "KGlobalAccel|"
 msgid "The '%1' key combination is registered by application %2 for action %3:"
-msgstr "???????????????%1??????????????? %2 ??????????????? %3???"
+msgstr "??????/???????????????%1????????????????????? %2 ????????? %3 
?????????"
 
 #: kglobalaccel.cpp:602
 #, qt-format
 msgctxt "KGlobalAccel|"
 msgid "In context '%1' for action '%2'\n"
-msgstr "?????????%2???????????????%1???\n"
+msgstr "????????????%2?????????%1????????????\n"
 
 #: kglobalaccel.cpp:605
 #, qt-format
@@ -67,13 +67,13 @@
 "The '%1' key combination is registered by application %2.\n"
 "%3"
 msgstr ""
-"???????????????%1??????????????? %2 ?????????\n"
+"??????/???????????????%1????????????????????? %2 ?????????\n"
 "%3"
 
 #: kglobalaccel.cpp:609
 msgctxt "KGlobalAccel|"
 msgid "Conflict With Registered Global Shortcut"
-msgstr "????????????????????????????????????"
+msgstr "????????????????????????????????????"
 
 #: runtime/main.cpp:38 runtime/main.cpp:40
 msgctxt "QObject|"
@@ -83,4 +83,4 @@
 #: runtime/main.cpp:43 runtime/main.cpp:44
 msgctxt "QObject|"
 msgid "Maintainer"
-msgstr "?????????"
+msgstr "???????????????"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kglobalaccel-5.78.0/src/CMakeLists.txt 
new/kglobalaccel-5.79.0/src/CMakeLists.txt
--- old/kglobalaccel-5.78.0/src/CMakeLists.txt  2021-01-02 14:14:45.000000000 
+0100
+++ new/kglobalaccel-5.79.0/src/CMakeLists.txt  2021-02-06 19:16:39.000000000 
+0100
@@ -39,7 +39,7 @@
 ecm_generate_export_header(KF5GlobalAccel
     BASE_NAME KGlobalAccel
     GROUP_BASE_NAME KF
-    VERSION ${KF5_VERSION}
+    VERSION ${KF_VERSION}
     DEPRECATED_BASE_VERSION 0
     DEPRECATION_VERSIONS 4.2 4.4 5.9
     EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT}
@@ -86,7 +86,7 @@
         KF5GlobalAccel_QCH
         NAME KGlobalAccel
         BASE_NAME KF5GlobalAccel
-        VERSION ${KF5_VERSION}
+        VERSION ${KF_VERSION}
         ORG_DOMAIN org.kde
         SOURCES # using only public headers, to cover only public API
             ${KGlobalAccel_HEADERS}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kglobalaccel-5.78.0/src/kglobalaccel.cpp 
new/kglobalaccel-5.79.0/src/kglobalaccel.cpp
--- old/kglobalaccel-5.78.0/src/kglobalaccel.cpp        2021-01-02 
14:14:45.000000000 +0100
+++ new/kglobalaccel-5.79.0/src/kglobalaccel.cpp        2021-02-06 
19:16:39.000000000 +0100
@@ -361,7 +361,7 @@
             // If kglobalaccel returned a shortcut that differs from the one we
             // sent, use that one. There must have been clashes or some other 
problem.
             actionShortcuts.insert(action, scResult);
-            emit q->globalShortcutChanged(action, scResult.isEmpty() ? 
QKeySequence() : scResult.first());
+            Q_EMIT q->globalShortcutChanged(action, scResult.isEmpty() ? 
QKeySequence() : scResult.first());
         }
     }
 
@@ -488,7 +488,7 @@
 
     const QList<QKeySequence> shortcuts = shortcutFromIntList(keys);
     actionShortcuts.insert(action, shortcuts);
-    emit q->globalShortcutChanged(action, keys.isEmpty() ? QKeySequence() : 
shortcuts.first());
+    Q_EMIT q->globalShortcutChanged(action, keys.isEmpty() ? QKeySequence() : 
shortcuts.first());
 }
 
 void KGlobalAccelPrivate::_k_serviceOwnerChanged(const QString &name, const 
QString &oldOwner,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kglobalaccel-5.78.0/src/runtime/CMakeLists.txt 
new/kglobalaccel-5.79.0/src/runtime/CMakeLists.txt
--- old/kglobalaccel-5.78.0/src/runtime/CMakeLists.txt  2021-01-02 
14:14:45.000000000 +0100
+++ new/kglobalaccel-5.79.0/src/runtime/CMakeLists.txt  2021-02-06 
19:16:39.000000000 +0100
@@ -24,7 +24,7 @@
     EXPORT_FILE_NAME kf5globalaccelprivate_export.h
     BASE_NAME KGlobalAccelPrivate
     GROUP_BASE_NAME KF
-    VERSION ${KF5_VERSION}
+    VERSION ${KF_VERSION}
     DEPRECATED_BASE_VERSION 0
     DEPRECATION_VERSIONS 4.3
     EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kglobalaccel-5.78.0/src/runtime/component.cpp 
new/kglobalaccel-5.79.0/src/runtime/component.cpp
--- old/kglobalaccel-5.78.0/src/runtime/component.cpp   2021-01-02 
14:14:45.000000000 +0100
+++ new/kglobalaccel-5.79.0/src/runtime/component.cpp   2021-02-06 
19:16:39.000000000 +0100
@@ -240,7 +240,7 @@
         return;
         }
 
-    emit globalShortcutPressed(
+    Q_EMIT globalShortcutPressed(
             shortcut.context()->component()->uniqueName(),
             shortcut.uniqueName(),
             timestamp);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kglobalaccel-5.78.0/src/runtime/kglobalaccel.desktop 
new/kglobalaccel-5.79.0/src/runtime/kglobalaccel.desktop
--- old/kglobalaccel-5.78.0/src/runtime/kglobalaccel.desktop    2021-01-02 
14:14:45.000000000 +0100
+++ new/kglobalaccel-5.79.0/src/runtime/kglobalaccel.desktop    2021-02-06 
19:16:39.000000000 +0100
@@ -84,5 +84,5 @@
 Name[vi]=M??y ch??? ph??m t???t to??n c???c KDED
 Name[wa]=Sierveu des rascourtis glob??s po KDED
 Name[x-test]=xxKDED Global Shortcuts Serverxx
-Name[zh_CN]=KDED ????????????????????????
+Name[zh_CN]=KDED ?????????????????????
 Name[zh_TW]=KDED ??????????????????
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kglobalaccel-5.78.0/src/runtime/kglobalacceld.cpp 
new/kglobalaccel-5.79.0/src/runtime/kglobalacceld.cpp
--- old/kglobalaccel-5.78.0/src/runtime/kglobalacceld.cpp       2021-01-02 
14:14:45.000000000 +0100
+++ new/kglobalaccel-5.79.0/src/runtime/kglobalacceld.cpp       2021-02-06 
19:16:39.000000000 +0100
@@ -558,7 +558,7 @@
 
     QList<int> newKeys = setShortcut(actionId, keys, NoAutoloading);
 
-    emit yourShortcutGotChanged(actionId, newKeys);
+    Q_EMIT yourShortcutGotChanged(actionId, newKeys);
 }
 
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kglobalaccel-5.78.0/src/runtime/plugins/xcb/CMakeLists.txt 
new/kglobalaccel-5.79.0/src/runtime/plugins/xcb/CMakeLists.txt
--- old/kglobalaccel-5.78.0/src/runtime/plugins/xcb/CMakeLists.txt      
2021-01-02 14:14:45.000000000 +0100
+++ new/kglobalaccel-5.79.0/src/runtime/plugins/xcb/CMakeLists.txt      
2021-02-06 19:16:39.000000000 +0100
@@ -15,5 +15,5 @@
     TARGETS
         KF5GlobalAccelPrivateXcb
     DESTINATION
-        ${PLUGIN_INSTALL_DIR}/org.kde.kglobalaccel5.platforms/
+        ${KDE_INSTALL_PLUGINDIR}/org.kde.kglobalaccel5.platforms/
 )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kglobalaccel-5.78.0/src/runtime/plugins/xcb/kglobalaccel_x11.cpp 
new/kglobalaccel-5.79.0/src/runtime/plugins/xcb/kglobalaccel_x11.cpp
--- old/kglobalaccel-5.78.0/src/runtime/plugins/xcb/kglobalaccel_x11.cpp        
2021-01-02 14:14:45.000000000 +0100
+++ new/kglobalaccel-5.79.0/src/runtime/plugins/xcb/kglobalaccel_x11.cpp        
2021-02-06 19:16:39.000000000 +0100
@@ -101,12 +101,7 @@
        // Resolve the modifier
        if( !KKeyServer::keyQtToModX(keyQt, &keyModX) ) {
             qCDebug(KGLOBALACCELD) << "keyQt (0x"
-                                   <<
-                          #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
-                                      hex
-                          #else
-                                      Qt::hex
-                          #endif
+                                   << Qt::hex
                                    << keyQt << ") failed to resolve to x11 
modifier";
                return false;
        }
@@ -114,12 +109,7 @@
        // Resolve the X symbol
        if( !KKeyServer::keyQtToSymX(keyQt, (int *)&keySymX) ) {
                 qCDebug(KGLOBALACCELD) << "keyQt (0x"
-                                       <<
-                              #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
-                                          hex
-                              #else
-                                          Qt::hex
-                              #endif
+                                       << Qt::hex
                                        << keyQt << ") failed to resolve to x11 
keycode";
                return false;
        }
@@ -149,12 +139,7 @@
 
         if( !keyCodeX ) {
             qCDebug(KGLOBALACCELD) << "keyQt (0x"
-                                   <<
-                          #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
-                                      hex
-                          #else
-                                      Qt::hex
-                          #endif
+                                   << Qt::hex
                                    << keyQt << ") was resolved to x11 keycode 
0";
             continue;
         }

Reply via email to