From 1b4a47cad0b37d31bd7f1090ff1c220e9307e8a6 Mon Sep 17 00:00:00 2001 From: Gui-Yue Date: Mon, 12 Jun 2023 15:11:00 +0000 Subject: [PATCH] feat:upgrade to 5.103 * upgrade to 5.103 from upstream log: upgrade --- CMakeLists.txt | 17 ++-- KF5DBusAddonsConfig.cmake.in | 4 +- autotests/kdbusservicetest.cpp | 23 +++--- autotests/pythontest.py | 24 ------ debian/changelog | 77 ++++++++++++++++++- debian/control | 24 +++--- debian/libkf5dbusaddons-bin.lintian-overrides | 2 +- debian/libkf5dbusaddons-dev.install | 1 - {po => poqm}/ar/kdbusaddons5_qt.po | 0 {po => poqm}/az/kdbusaddons5_qt.po | 0 poqm/bg/kdbusaddons5_qt.po | 54 +++++++++++++ {po => poqm}/bs/kdbusaddons5_qt.po | 0 {po => poqm}/ca/kdbusaddons5_qt.po | 1 + {po => poqm}/ca@valencia/kdbusaddons5_qt.po | 21 +++-- {po => poqm}/cs/kdbusaddons5_qt.po | 0 {po => poqm}/da/kdbusaddons5_qt.po | 0 {po => poqm}/de/kdbusaddons5_qt.po | 0 {po => poqm}/el/kdbusaddons5_qt.po | 0 {po => poqm}/en_GB/kdbusaddons5_qt.po | 0 {po => poqm}/es/kdbusaddons5_qt.po | 0 {po => poqm}/et/kdbusaddons5_qt.po | 0 {po => poqm}/eu/kdbusaddons5_qt.po | 0 {po => poqm}/fi/kdbusaddons5_qt.po | 0 {po => poqm}/fr/kdbusaddons5_qt.po | 0 {po => poqm}/gd/kdbusaddons5_qt.po | 0 {po => poqm}/gl/kdbusaddons5_qt.po | 0 {po => poqm}/hi/kdbusaddons5_qt.po | 0 {po => poqm}/hu/kdbusaddons5_qt.po | 0 {po => poqm}/ia/kdbusaddons5_qt.po | 0 {po => poqm}/id/kdbusaddons5_qt.po | 1 - poqm/is/kdbusaddons5_qt.po | 52 +++++++++++++ {po => poqm}/it/kdbusaddons5_qt.po | 0 {po => poqm}/ja/kdbusaddons5_qt.po | 0 poqm/ka/kdbusaddons5_qt.po | 53 +++++++++++++ {po => poqm}/ko/kdbusaddons5_qt.po | 0 {po => poqm}/lt/kdbusaddons5_qt.po | 0 {po => poqm}/ml/kdbusaddons5_qt.po | 0 {po => poqm}/nb/kdbusaddons5_qt.po | 0 {po => poqm}/nds/kdbusaddons5_qt.po | 0 {po => poqm}/nl/kdbusaddons5_qt.po | 0 {po => poqm}/nn/kdbusaddons5_qt.po | 0 {po => poqm}/pa/kdbusaddons5_qt.po | 0 {po => poqm}/pl/kdbusaddons5_qt.po | 0 {po => poqm}/pt/kdbusaddons5_qt.po | 0 {po => poqm}/pt_BR/kdbusaddons5_qt.po | 0 {po => poqm}/ro/kdbusaddons5_qt.po | 0 {po => poqm}/ru/kdbusaddons5_qt.po | 0 {po => poqm}/se/kdbusaddons5_qt.po | 0 {po => poqm}/sk/kdbusaddons5_qt.po | 0 {po => poqm}/sl/kdbusaddons5_qt.po | 0 {po => poqm}/sr/kdbusaddons5_qt.po | 0 {po => poqm}/sr@ijekavian/kdbusaddons5_qt.po | 0 .../sr@ijekavianlatin/kdbusaddons5_qt.po | 0 {po => poqm}/sr@latin/kdbusaddons5_qt.po | 0 {po => poqm}/sv/kdbusaddons5_qt.po | 0 {po => poqm}/tg/kdbusaddons5_qt.po | 0 {po => poqm}/tr/kdbusaddons5_qt.po | 9 ++- {po => poqm}/uk/kdbusaddons5_qt.po | 0 {po => poqm}/zh_CN/kdbusaddons5_qt.po | 3 +- {po => poqm}/zh_TW/kdbusaddons5_qt.po | 0 src/CMakeLists.txt | 36 ++++----- src/kdbusservice.h | 5 ++ src/kdedmodule.cpp | 5 +- src/kdedmodule.h | 7 +- src/tools/kquitapp/CMakeLists.txt | 2 +- src/updatelaunchenvironmentjob.cpp | 24 +++--- src/updatelaunchenvironmentjob.h | 10 ++- 67 files changed, 339 insertions(+), 116 deletions(-) delete mode 100644 autotests/pythontest.py rename {po => poqm}/ar/kdbusaddons5_qt.po (100%) rename {po => poqm}/az/kdbusaddons5_qt.po (100%) create mode 100644 poqm/bg/kdbusaddons5_qt.po rename {po => poqm}/bs/kdbusaddons5_qt.po (100%) rename {po => poqm}/ca/kdbusaddons5_qt.po (97%) rename {po => poqm}/ca@valencia/kdbusaddons5_qt.po (74%) rename {po => poqm}/cs/kdbusaddons5_qt.po (100%) rename {po => poqm}/da/kdbusaddons5_qt.po (100%) rename {po => poqm}/de/kdbusaddons5_qt.po (100%) rename {po => poqm}/el/kdbusaddons5_qt.po (100%) rename {po => poqm}/en_GB/kdbusaddons5_qt.po (100%) rename {po => poqm}/es/kdbusaddons5_qt.po (100%) rename {po => poqm}/et/kdbusaddons5_qt.po (100%) rename {po => poqm}/eu/kdbusaddons5_qt.po (100%) rename {po => poqm}/fi/kdbusaddons5_qt.po (100%) rename {po => poqm}/fr/kdbusaddons5_qt.po (100%) rename {po => poqm}/gd/kdbusaddons5_qt.po (100%) rename {po => poqm}/gl/kdbusaddons5_qt.po (100%) rename {po => poqm}/hi/kdbusaddons5_qt.po (100%) rename {po => poqm}/hu/kdbusaddons5_qt.po (100%) rename {po => poqm}/ia/kdbusaddons5_qt.po (100%) rename {po => poqm}/id/kdbusaddons5_qt.po (98%) create mode 100644 poqm/is/kdbusaddons5_qt.po rename {po => poqm}/it/kdbusaddons5_qt.po (100%) rename {po => poqm}/ja/kdbusaddons5_qt.po (100%) create mode 100644 poqm/ka/kdbusaddons5_qt.po rename {po => poqm}/ko/kdbusaddons5_qt.po (100%) rename {po => poqm}/lt/kdbusaddons5_qt.po (100%) rename {po => poqm}/ml/kdbusaddons5_qt.po (100%) rename {po => poqm}/nb/kdbusaddons5_qt.po (100%) rename {po => poqm}/nds/kdbusaddons5_qt.po (100%) rename {po => poqm}/nl/kdbusaddons5_qt.po (100%) rename {po => poqm}/nn/kdbusaddons5_qt.po (100%) rename {po => poqm}/pa/kdbusaddons5_qt.po (100%) rename {po => poqm}/pl/kdbusaddons5_qt.po (100%) rename {po => poqm}/pt/kdbusaddons5_qt.po (100%) rename {po => poqm}/pt_BR/kdbusaddons5_qt.po (100%) rename {po => poqm}/ro/kdbusaddons5_qt.po (100%) rename {po => poqm}/ru/kdbusaddons5_qt.po (100%) rename {po => poqm}/se/kdbusaddons5_qt.po (100%) rename {po => poqm}/sk/kdbusaddons5_qt.po (100%) rename {po => poqm}/sl/kdbusaddons5_qt.po (100%) rename {po => poqm}/sr/kdbusaddons5_qt.po (100%) rename {po => poqm}/sr@ijekavian/kdbusaddons5_qt.po (100%) rename {po => poqm}/sr@ijekavianlatin/kdbusaddons5_qt.po (100%) rename {po => poqm}/sr@latin/kdbusaddons5_qt.po (100%) rename {po => poqm}/sv/kdbusaddons5_qt.po (100%) rename {po => poqm}/tg/kdbusaddons5_qt.po (100%) rename {po => poqm}/tr/kdbusaddons5_qt.po (78%) rename {po => poqm}/uk/kdbusaddons5_qt.po (100%) rename {po => poqm}/zh_CN/kdbusaddons5_qt.po (94%) rename {po => poqm}/zh_TW/kdbusaddons5_qt.po (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c2005c8..9bf5bcb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.90.0") # handled by release scripts +set(KF_VERSION "5.103.0") # handled by release scripts project(KDBusAddons VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.90.0 NO_MODULE) +find_package(ECM 5.103.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) @@ -16,6 +16,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(KDEGitCommitHooks) include(ECMQtDeclareLoggingCategory) +include(ECMDeprecationSettings) set(REQUIRED_QT_VERSION 5.15.2) find_package(Qt${QT_MAJOR_VERSION}DBus ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) @@ -42,7 +43,7 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KDBUSADDONS SOVERSION 5) # qtx11extras_p.h is in Qt6Gui -if(TARGET Qt5::X11Extras OR TARGET Qt6::Gui) +if(TARGET Qt5::X11Extras OR (TARGET Qt6::Gui AND NOT WIN32)) set(HAVE_X11 TRUE) else() set(HAVE_X11 FALSE) @@ -53,8 +54,12 @@ set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprec 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)") -ecm_install_po_files_as_qm(po) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) +ecm_set_disabled_deprecation_versions( + QT 5.15.2 +) + +ecm_install_po_files_as_qm(poqm) + add_subdirectory(src) if (BUILD_TESTING) add_subdirectory(autotests) @@ -88,7 +93,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KF5DBusAddonsConfig.cmake" install(EXPORT KF5DBusAddonsTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5DBusAddonsTargets.cmake NAMESPACE KF5:: ) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdbusaddons_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel ) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdbusaddons_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KDBusAddons COMPONENT Devel) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/KF5DBusAddonsConfig.cmake.in b/KF5DBusAddonsConfig.cmake.in index 8d8cea5..acc7361 100644 --- a/KF5DBusAddonsConfig.cmake.in +++ b/KF5DBusAddonsConfig.cmake.in @@ -6,9 +6,9 @@ find_dependency(Qt@QT_MAJOR_VERSION@DBus @REQUIRED_QT_VERSION@) if(NOT @BUILD_SHARED_LIBS@) # Qt5::DBus target will have been defined by the find_dependency() call above # at the time where this file is used - if(TARGET Qt5::DBus) + if(@Qt5X11Extras_FOUND@) find_dependency(Qt5X11Extras @REQUIRED_QT_VERSION@) - else() + elseif(@Qt6Gui_FOUND@) find_dependency(Qt6Gui @REQUIRED_QT_VERSION@) # qtx11extras_p.h endif() endif() diff --git a/autotests/kdbusservicetest.cpp b/autotests/kdbusservicetest.cpp index 0003819..fbff717 100644 --- a/autotests/kdbusservicetest.cpp +++ b/autotests/kdbusservicetest.cpp @@ -66,6 +66,14 @@ class TestObject : public QObject } } +public Q_SLOTS: + void firstCall() + { + QStringList args; + args << QStringLiteral("bad call"); + executeNewChild(args); + } + private Q_SLOTS: void slotProcessFinished(int exitCode, QProcess::ExitStatus exitStatus) { @@ -78,13 +86,6 @@ private Q_SLOTS: } } - void firstCall() - { - QStringList args; - args << QStringLiteral("bad call"); - executeNewChild(args); - } - void secondCall() { QStringList args; @@ -139,9 +140,11 @@ int main(int argc, char *argv[]) QStringList args; args << QStringLiteral("dummy call"); - QMetaObject::invokeMethod(&service, "activateRequested", Qt::QueuedConnection, Q_ARG(QStringList, args), Q_ARG(QString, QDir::currentPath())); - QTimer::singleShot(400, &testObject, SLOT(firstCall())); - + auto activateSignal = [&service, &args]() { + service.activateRequested(args, QDir::currentPath()); + }; + QMetaObject::invokeMethod(&service, activateSignal, Qt::QueuedConnection); + QTimer::singleShot(400, &testObject, &TestObject::firstCall); qDebug() << "Running."; a.exec(); qDebug() << "Terminating."; diff --git a/autotests/pythontest.py b/autotests/pythontest.py deleted file mode 100644 index 1c9fda4..0000000 --- a/autotests/pythontest.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -#-*- coding: utf-8 -*- - -from __future__ import print_function - -import sys - -sys.path.append(sys.argv[1]) - -from PyQt5 import QtCore -from PyQt5 import QtWidgets - -from PyKF5 import KDBusAddons - -def main(): - app = QtWidgets.QApplication(sys.argv) - - kdm = KDBusAddons.KDEDModule() - kdm.setModuleName("MyService") - - assert(kdm.moduleName() == "MyService") - -if __name__ == '__main__': - sys.exit(main()) diff --git a/debian/changelog b/debian/changelog index 97e1b7d..5e6ce2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,79 @@ -kdbusaddons (5.90.0-1) UNRELEASED; urgency=medium +kdbusaddons (5.103.0-1) unstable; urgency=medium - * update + [ Aurélien COUDERC ] + * New upstream release (5.103.0). + * Update build-deps and deps with the info from cmake. + + -- Aurélien COUDERC Sun, 12 Feb 2023 21:44:22 +0100 + +kdbusaddons (5.102.0-1) unstable; urgency=medium + + [ Aurélien COUDERC ] + * New upstream release (5.102.0). + * Update build-deps and deps with the info from cmake. + * Bump Standards-Version to 4.6.2, no change required. + + -- Aurélien COUDERC Sun, 22 Jan 2023 21:35:00 +0100 + +kdbusaddons (5.101.0-1) unstable; urgency=medium + + [ Aurélien COUDERC ] + * New upstream release (5.101.0). + * Update build-deps and deps with the info from cmake. + + -- Aurélien COUDERC Tue, 13 Dec 2022 07:40:20 +0100 + +kdbusaddons (5.100.0-1) unstable; urgency=medium + + [ Aurélien COUDERC ] + * New upstream release (5.99.0). + * Update build-deps and deps with the info from cmake. + * New upstream release (5.100.0). + * Update build-deps and deps with the info from cmake. + + -- Aurélien COUDERC Sat, 19 Nov 2022 23:18:55 +0100 + +kdbusaddons (5.98.0-1) unstable; urgency=medium + + [ Aurélien COUDERC ] + * New upstream release (5.98.0). + * Update build-deps and deps with the info from cmake. + + -- Aurélien COUDERC Sun, 18 Sep 2022 23:11:34 +0200 + +kdbusaddons (5.97.0-1) unstable; urgency=medium + + [ Aurélien COUDERC ] + * New upstream release (5.97.0). + + -- Aurélien COUDERC Sun, 14 Aug 2022 18:55:27 +0200 + +kdbusaddons (5.96.0-1) unstable; urgency=medium + + [ Aurélien COUDERC ] + * New upstream release (5.96.0). + * Bump Standards-Version to 4.6.1, no change required. + * Refresh lintian overrides. + + -- Aurélien COUDERC Sun, 31 Jul 2022 13:32:55 +0200 + +kdbusaddons (5.94.0-1) unstable; urgency=medium + + [ Aurélien COUDERC ] + * New upstream release (5.94.0). + + -- Aurélien COUDERC Thu, 19 May 2022 23:59:02 +0200 + +kdbusaddons (5.93.0-1) unstable; urgency=medium + + [ Aurélien COUDERC ] + * New upstream release (5.92.0). + * Update the list of installed files. + * New upstream release (5.93.0). - -- Debian Qt/KDE Maintainers Sun, 24 Apr 2022 16:25:35 +0800 + -- Aurélien COUDERC Wed, 11 May 2022 23:22:43 +0200 -kdbusaddons (5.90.0-1) experimental; urgency=medium +kdbusaddons (5.90.0-1) unstable; urgency=medium [ Norbert Preining ] * New upstream release (5.89.0). diff --git a/debian/control b/debian/control index 0f86400..51dd366 100644 --- a/debian/control +++ b/debian/control @@ -8,14 +8,14 @@ Build-Depends: cmake (>= 3.16~), dbus-x11 , debhelper-compat (= 13), doxygen, - extra-cmake-modules (>= 5.90.0~), + extra-cmake-modules (>= 5.103.0~), libqt5sql5-sqlite:native, libqt5x11extras5-dev (>= 5.15.2~), pkg-kde-tools (>= 0.15.15ubuntu1~), qtbase5-dev (>= 5.15.2~), qttools5-dev (>= 5.4), qttools5-dev-tools (>= 5.4), -Standards-Version: 4.6.0 +Standards-Version: 4.6.2 Homepage: https://invent.kde.org/frameworks/kdbusaddons Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kdbusaddons Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kdbusaddons.git @@ -23,9 +23,9 @@ Rules-Requires-Root: no Package: libkf5dbusaddons-bin Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Breaks: libkf5dbusaddons5-bin -Replaces: libkf5dbusaddons5-bin +Depends: ${misc:Depends}, ${shlibs:Depends}, +Breaks: libkf5dbusaddons5-bin, +Replaces: libkf5dbusaddons5-bin, Description: class library for qtdbus KDBusAddons provides convenience classes on top of QtDBus, as well as an API to create KDED modules. @@ -35,9 +35,9 @@ Description: class library for qtdbus Package: libkf5dbusaddons-data Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends} -Breaks: libkf5dbusaddons5-data -Replaces: libkf5dbusaddons5-data +Depends: ${misc:Depends}, ${shlibs:Depends}, +Breaks: libkf5dbusaddons5-data, +Replaces: libkf5dbusaddons5-data, Description: class library for qtdbus KDBusAddons provides convenience classes on top of QtDBus, as well as an API to create KDED modules. @@ -50,8 +50,8 @@ Architecture: any Depends: libkf5dbusaddons5 (= ${binary:Version}), qtbase5-dev (>= 5.15.2~), ${misc:Depends}, -Breaks: kded5-dev (<< 5.54), libkf5service-dev (<< 5.54) -Recommends: libkf5dbusaddons-doc (= ${source:Version}) +Breaks: kded5-dev (<< 5.54), libkf5service-dev (<< 5.54), +Recommends: libkf5dbusaddons-doc (= ${source:Version}), Description: development files for dbusaddons KDBusAddons provides convenience classes on top of QtDBus, as well as an API to create KDED modules. @@ -59,7 +59,7 @@ Description: development files for dbusaddons Package: libkf5dbusaddons-doc Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends} +Depends: ${misc:Depends}, Description: class library for qtdbus (documentation) KDBusAddons provides convenience classes on top of QtDBus, as well as an API to create KDED modules. @@ -82,7 +82,7 @@ Breaks: baloo-kf5 (<< 5.54), libkf5service5 (<< 5.54), libkf5wallet-bin (<< 5.54), plasma-framework (<< 5.25), -Recommends: libkf5dbusaddons-bin (= ${binary:Version}) +Recommends: libkf5dbusaddons-bin (= ${binary:Version}), Description: class library for qtdbus KDBusAddons provides convenience classes on top of QtDBus, as well as an API to create KDED modules. diff --git a/debian/libkf5dbusaddons-bin.lintian-overrides b/debian/libkf5dbusaddons-bin.lintian-overrides index cee555b..f906c1a 100644 --- a/debian/libkf5dbusaddons-bin.lintian-overrides +++ b/debian/libkf5dbusaddons-bin.lintian-overrides @@ -1 +1 @@ -libkf5dbusaddons-bin: binary-without-manpage usr/bin/kquitapp5 +libkf5dbusaddons-bin: no-manual-page [usr/bin/kquitapp5] diff --git a/debian/libkf5dbusaddons-dev.install b/debian/libkf5dbusaddons-dev.install index ce46a6b..0358285 100644 --- a/debian/libkf5dbusaddons-dev.install +++ b/debian/libkf5dbusaddons-dev.install @@ -1,4 +1,3 @@ -/usr/include/KF5/kdbusaddons_version.h usr/include/KF5/KDBusAddons/ usr/lib/*/cmake/KF5DBusAddons/ usr/lib/*/libKF5DBusAddons.so diff --git a/po/ar/kdbusaddons5_qt.po b/poqm/ar/kdbusaddons5_qt.po similarity index 100% rename from po/ar/kdbusaddons5_qt.po rename to poqm/ar/kdbusaddons5_qt.po diff --git a/po/az/kdbusaddons5_qt.po b/poqm/az/kdbusaddons5_qt.po similarity index 100% rename from po/az/kdbusaddons5_qt.po rename to poqm/az/kdbusaddons5_qt.po diff --git a/poqm/bg/kdbusaddons5_qt.po b/poqm/bg/kdbusaddons5_qt.po new file mode 100644 index 0000000..a731eb2 --- /dev/null +++ b/poqm/bg/kdbusaddons5_qt.po @@ -0,0 +1,54 @@ +# Mincho Kondarev , 2022. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: 2022-05-20 18:59+0200\n" +"Last-Translator: Mincho Kondarev \n" +"Language-Team: Bulgarian \n" +"Language: bg\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Qt-Contexts: true\n" +"X-Generator: Lokalize 22.04.0\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#: tools/kquitapp/kquitapp.cpp:19 +msgctxt "main|" +msgid "Quit a D-Bus enabled application easily" +msgstr "Излезте лесно от приложение с активиран D-Bus" + +#: tools/kquitapp/kquitapp.cpp:21 +msgctxt "main|" +msgid "Full service name, overrides application name provided" +msgstr "Пълно име на услугата, замества предоставеното име на приложението" + +#: tools/kquitapp/kquitapp.cpp:24 +msgctxt "main|" +msgid "Path in the D-Bus interface to use" +msgstr "Път в интерфейса на D-Bus, който да се използва" + +#: tools/kquitapp/kquitapp.cpp:27 +msgctxt "main|" +msgid "The name of the application to quit" +msgstr "Името на приложението за излизане" + +#: tools/kquitapp/kquitapp.cpp:45 +#, qt-format +msgctxt "main|" +msgid "Application %1 could not be found using service %2 and path %3." +msgstr "" +"Приложение %1 не можа да бъде намерено с помощта на услуга %2 и път %3." + +#: tools/kquitapp/kquitapp.cpp:52 +#, qt-format +msgctxt "main|" +msgid "" +"Quitting application %1 failed. Error reported was:\n" +"\n" +" %2 : %3" +msgstr "" +"Излизането от приложението %1 е неуспешно. Съобщената грешка беше:\n" +"\n" +" %2 : %3" diff --git a/po/bs/kdbusaddons5_qt.po b/poqm/bs/kdbusaddons5_qt.po similarity index 100% rename from po/bs/kdbusaddons5_qt.po rename to poqm/bs/kdbusaddons5_qt.po diff --git a/po/ca/kdbusaddons5_qt.po b/poqm/ca/kdbusaddons5_qt.po similarity index 97% rename from po/ca/kdbusaddons5_qt.po rename to poqm/ca/kdbusaddons5_qt.po index 951d0b1..f1b6f99 100644 --- a/po/ca/kdbusaddons5_qt.po +++ b/poqm/ca/kdbusaddons5_qt.po @@ -5,6 +5,7 @@ # # Josep M. Ferrer , 2014. # Antoni Bella Pérez , 2015, 2020. +# Empar Montoro Martín , 2019. msgid "" msgstr "" "Project-Id-Version: kdbusaddons\n" diff --git a/po/ca@valencia/kdbusaddons5_qt.po b/poqm/ca@valencia/kdbusaddons5_qt.po similarity index 74% rename from po/ca@valencia/kdbusaddons5_qt.po rename to poqm/ca@valencia/kdbusaddons5_qt.po index 9ba7f88..db14337 100644 --- a/po/ca@valencia/kdbusaddons5_qt.po +++ b/poqm/ca@valencia/kdbusaddons5_qt.po @@ -1,38 +1,37 @@ # Translation of kdbusaddons5_qt.po to Catalan (Valencian) -# Copyright (C) 2014-2019 This_file_is_part_of_KDE +# Copyright (C) 2014-2020 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # # Josep M. Ferrer , 2014. -# Antoni Bella Pérez , 2015. +# Antoni Bella Pérez , 2015, 2020. # Empar Montoro Martín , 2019. msgid "" msgstr "" "Project-Id-Version: kdbusaddons\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2019-06-17 13:12+0200\n" -"Last-Translator: Empar Montoro Martín \n" +"PO-Revision-Date: 2020-07-14 13:16+0200\n" +"Last-Translator: Antoni Bella Pérez \n" "Language-Team: Catalan \n" "Language: ca@valencia\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-Accelerator-Marker: &\n" -"X-Generator: Poedit 2.0.6\n" "X-Qt-Contexts: true\n" -"X-Project-Style: kde\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Accelerator-Marker: &\n" +"X-Generator: Lokalize 20.04.3\n" #: tools/kquitapp/kquitapp.cpp:19 msgctxt "main|" msgid "Quit a D-Bus enabled application easily" -msgstr "Ix fàcilment d'una aplicació activada des de D-Bus" +msgstr "Ix amb facilitat d'una aplicació amb D-Bus activat" #: tools/kquitapp/kquitapp.cpp:21 msgctxt "main|" msgid "Full service name, overrides application name provided" -msgstr "Nom complet del servei, substitueix el nom subministrat de l'aplicació" +msgstr "Nom complet del servei, substituïx el nom subministrat per l'aplicació" #: tools/kquitapp/kquitapp.cpp:24 msgctxt "main|" @@ -59,6 +58,6 @@ msgid "" "\n" " %2 : %3" msgstr "" -"Ha fallat en eixir de l'aplicació %1. L'error reportat ha estat:\n" +"No s'ha pogut eixir de l'aplicació %1. L'error reportat ha sigut:\n" "\n" " %2: %3" diff --git a/po/cs/kdbusaddons5_qt.po b/poqm/cs/kdbusaddons5_qt.po similarity index 100% rename from po/cs/kdbusaddons5_qt.po rename to poqm/cs/kdbusaddons5_qt.po diff --git a/po/da/kdbusaddons5_qt.po b/poqm/da/kdbusaddons5_qt.po similarity index 100% rename from po/da/kdbusaddons5_qt.po rename to poqm/da/kdbusaddons5_qt.po diff --git a/po/de/kdbusaddons5_qt.po b/poqm/de/kdbusaddons5_qt.po similarity index 100% rename from po/de/kdbusaddons5_qt.po rename to poqm/de/kdbusaddons5_qt.po diff --git a/po/el/kdbusaddons5_qt.po b/poqm/el/kdbusaddons5_qt.po similarity index 100% rename from po/el/kdbusaddons5_qt.po rename to poqm/el/kdbusaddons5_qt.po diff --git a/po/en_GB/kdbusaddons5_qt.po b/poqm/en_GB/kdbusaddons5_qt.po similarity index 100% rename from po/en_GB/kdbusaddons5_qt.po rename to poqm/en_GB/kdbusaddons5_qt.po diff --git a/po/es/kdbusaddons5_qt.po b/poqm/es/kdbusaddons5_qt.po similarity index 100% rename from po/es/kdbusaddons5_qt.po rename to poqm/es/kdbusaddons5_qt.po diff --git a/po/et/kdbusaddons5_qt.po b/poqm/et/kdbusaddons5_qt.po similarity index 100% rename from po/et/kdbusaddons5_qt.po rename to poqm/et/kdbusaddons5_qt.po diff --git a/po/eu/kdbusaddons5_qt.po b/poqm/eu/kdbusaddons5_qt.po similarity index 100% rename from po/eu/kdbusaddons5_qt.po rename to poqm/eu/kdbusaddons5_qt.po diff --git a/po/fi/kdbusaddons5_qt.po b/poqm/fi/kdbusaddons5_qt.po similarity index 100% rename from po/fi/kdbusaddons5_qt.po rename to poqm/fi/kdbusaddons5_qt.po diff --git a/po/fr/kdbusaddons5_qt.po b/poqm/fr/kdbusaddons5_qt.po similarity index 100% rename from po/fr/kdbusaddons5_qt.po rename to poqm/fr/kdbusaddons5_qt.po diff --git a/po/gd/kdbusaddons5_qt.po b/poqm/gd/kdbusaddons5_qt.po similarity index 100% rename from po/gd/kdbusaddons5_qt.po rename to poqm/gd/kdbusaddons5_qt.po diff --git a/po/gl/kdbusaddons5_qt.po b/poqm/gl/kdbusaddons5_qt.po similarity index 100% rename from po/gl/kdbusaddons5_qt.po rename to poqm/gl/kdbusaddons5_qt.po diff --git a/po/hi/kdbusaddons5_qt.po b/poqm/hi/kdbusaddons5_qt.po similarity index 100% rename from po/hi/kdbusaddons5_qt.po rename to poqm/hi/kdbusaddons5_qt.po diff --git a/po/hu/kdbusaddons5_qt.po b/poqm/hu/kdbusaddons5_qt.po similarity index 100% rename from po/hu/kdbusaddons5_qt.po rename to poqm/hu/kdbusaddons5_qt.po diff --git a/po/ia/kdbusaddons5_qt.po b/poqm/ia/kdbusaddons5_qt.po similarity index 100% rename from po/ia/kdbusaddons5_qt.po rename to poqm/ia/kdbusaddons5_qt.po diff --git a/po/id/kdbusaddons5_qt.po b/poqm/id/kdbusaddons5_qt.po similarity index 98% rename from po/id/kdbusaddons5_qt.po rename to poqm/id/kdbusaddons5_qt.po index 97d0514..d4a41f6 100644 --- a/po/id/kdbusaddons5_qt.po +++ b/poqm/id/kdbusaddons5_qt.po @@ -15,7 +15,6 @@ msgstr "" "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.12.1\n" "X-Qt-Contexts: true\n" #: tools/kquitapp/kquitapp.cpp:19 diff --git a/poqm/is/kdbusaddons5_qt.po b/poqm/is/kdbusaddons5_qt.po new file mode 100644 index 0000000..5034cfd --- /dev/null +++ b/poqm/is/kdbusaddons5_qt.po @@ -0,0 +1,52 @@ +# Sveinn í Felli , 2023. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"PO-Revision-Date: 2023-02-02 15:35+0000\n" +"Last-Translator: Sveinn í Felli \n" +"Language-Team: Icelandic\n" +"Language: is\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Qt-Contexts: true\n" +"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 21.12.3\n" + +#: tools/kquitapp/kquitapp.cpp:19 +msgctxt "main|" +msgid "Quit a D-Bus enabled application easily" +msgstr "Hætta auðveldlega í D-Bus samhæfðu forriti" + +#: tools/kquitapp/kquitapp.cpp:21 +msgctxt "main|" +msgid "Full service name, overrides application name provided" +msgstr "Fullt heiti þjónustu, hefur meira vægi en nafn forrits" + +#: tools/kquitapp/kquitapp.cpp:24 +msgctxt "main|" +msgid "Path in the D-Bus interface to use" +msgstr "Slóð sem nota á í D-Bus viðmóti" + +#: tools/kquitapp/kquitapp.cpp:27 +msgctxt "main|" +msgid "The name of the application to quit" +msgstr "Nafn forrits sem hætta á í" + +#: tools/kquitapp/kquitapp.cpp:45 +#, qt-format +msgctxt "main|" +msgid "Application %1 could not be found using service %2 and path %3." +msgstr "Forritið %1 fannst ekki með því að nota þjónustuna %2 og slóðina %3." + +#: tools/kquitapp/kquitapp.cpp:52 +#, qt-format +msgctxt "main|" +msgid "" +"Quitting application %1 failed. Error reported was:\n" +"\n" +" %2 : %3" +msgstr "" +"Lokun forritsins %1 mistókst. Tilkynnt var um villu:\n" +"\n" +" %2 : %3" diff --git a/po/it/kdbusaddons5_qt.po b/poqm/it/kdbusaddons5_qt.po similarity index 100% rename from po/it/kdbusaddons5_qt.po rename to poqm/it/kdbusaddons5_qt.po diff --git a/po/ja/kdbusaddons5_qt.po b/poqm/ja/kdbusaddons5_qt.po similarity index 100% rename from po/ja/kdbusaddons5_qt.po rename to poqm/ja/kdbusaddons5_qt.po diff --git a/poqm/ka/kdbusaddons5_qt.po b/poqm/ka/kdbusaddons5_qt.po new file mode 100644 index 0000000..525d4fd --- /dev/null +++ b/poqm/ka/kdbusaddons5_qt.po @@ -0,0 +1,53 @@ +msgid "" +msgstr "" +"Project-Id-Version: kdbusaddons5_qt\n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: Temuri Doghonadze \n" +"Language-Team: Georgian \n" +"Language: ka\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-Qt-Contexts: true\n" +"X-Generator: Poedit 3.0.1\n" + +#: tools/kquitapp/kquitapp.cpp:19 +msgctxt "main|" +msgid "Quit a D-Bus enabled application easily" +msgstr "D-Bus-ის მხარდაჭერის მქონე აპლიკაციებიდან ადვილად გამოსვლა" + +#: tools/kquitapp/kquitapp.cpp:21 +msgctxt "main|" +msgid "Full service name, overrides application name provided" +msgstr "სერვისის სრული სახელი. გადაფარავს აპლიკაციის მითითებულ სახელს" + +#: tools/kquitapp/kquitapp.cpp:24 +msgctxt "main|" +msgid "Path in the D-Bus interface to use" +msgstr "D-Bus-ის ინტერფეისის ბილიკი" + +#: tools/kquitapp/kquitapp.cpp:27 +msgctxt "main|" +msgid "The name of the application to quit" +msgstr "გასათიში აპლიკაციის სახელი" + +#: tools/kquitapp/kquitapp.cpp:45 +#, qt-format +msgctxt "main|" +msgid "Application %1 could not be found using service %2 and path %3." +msgstr "სერვისის (%2) და ბილიკის (%3) გამოყენებით აპლიკაცია (%1) ნაპოვნი არაა." + +#: tools/kquitapp/kquitapp.cpp:52 +#, qt-format +msgctxt "main|" +msgid "" +"Quitting application %1 failed. Error reported was:\n" +"\n" +" %2 : %3" +msgstr "" +"აპლიკაციიდან (%1) გამოსვლის შეცდომა. \n" +"აპლიკაციის მიერ დაბრუნებული შეტყობინება:\n" +"\n" +" %2 : %3" diff --git a/po/ko/kdbusaddons5_qt.po b/poqm/ko/kdbusaddons5_qt.po similarity index 100% rename from po/ko/kdbusaddons5_qt.po rename to poqm/ko/kdbusaddons5_qt.po diff --git a/po/lt/kdbusaddons5_qt.po b/poqm/lt/kdbusaddons5_qt.po similarity index 100% rename from po/lt/kdbusaddons5_qt.po rename to poqm/lt/kdbusaddons5_qt.po diff --git a/po/ml/kdbusaddons5_qt.po b/poqm/ml/kdbusaddons5_qt.po similarity index 100% rename from po/ml/kdbusaddons5_qt.po rename to poqm/ml/kdbusaddons5_qt.po diff --git a/po/nb/kdbusaddons5_qt.po b/poqm/nb/kdbusaddons5_qt.po similarity index 100% rename from po/nb/kdbusaddons5_qt.po rename to poqm/nb/kdbusaddons5_qt.po diff --git a/po/nds/kdbusaddons5_qt.po b/poqm/nds/kdbusaddons5_qt.po similarity index 100% rename from po/nds/kdbusaddons5_qt.po rename to poqm/nds/kdbusaddons5_qt.po diff --git a/po/nl/kdbusaddons5_qt.po b/poqm/nl/kdbusaddons5_qt.po similarity index 100% rename from po/nl/kdbusaddons5_qt.po rename to poqm/nl/kdbusaddons5_qt.po diff --git a/po/nn/kdbusaddons5_qt.po b/poqm/nn/kdbusaddons5_qt.po similarity index 100% rename from po/nn/kdbusaddons5_qt.po rename to poqm/nn/kdbusaddons5_qt.po diff --git a/po/pa/kdbusaddons5_qt.po b/poqm/pa/kdbusaddons5_qt.po similarity index 100% rename from po/pa/kdbusaddons5_qt.po rename to poqm/pa/kdbusaddons5_qt.po diff --git a/po/pl/kdbusaddons5_qt.po b/poqm/pl/kdbusaddons5_qt.po similarity index 100% rename from po/pl/kdbusaddons5_qt.po rename to poqm/pl/kdbusaddons5_qt.po diff --git a/po/pt/kdbusaddons5_qt.po b/poqm/pt/kdbusaddons5_qt.po similarity index 100% rename from po/pt/kdbusaddons5_qt.po rename to poqm/pt/kdbusaddons5_qt.po diff --git a/po/pt_BR/kdbusaddons5_qt.po b/poqm/pt_BR/kdbusaddons5_qt.po similarity index 100% rename from po/pt_BR/kdbusaddons5_qt.po rename to poqm/pt_BR/kdbusaddons5_qt.po diff --git a/po/ro/kdbusaddons5_qt.po b/poqm/ro/kdbusaddons5_qt.po similarity index 100% rename from po/ro/kdbusaddons5_qt.po rename to poqm/ro/kdbusaddons5_qt.po diff --git a/po/ru/kdbusaddons5_qt.po b/poqm/ru/kdbusaddons5_qt.po similarity index 100% rename from po/ru/kdbusaddons5_qt.po rename to poqm/ru/kdbusaddons5_qt.po diff --git a/po/se/kdbusaddons5_qt.po b/poqm/se/kdbusaddons5_qt.po similarity index 100% rename from po/se/kdbusaddons5_qt.po rename to poqm/se/kdbusaddons5_qt.po diff --git a/po/sk/kdbusaddons5_qt.po b/poqm/sk/kdbusaddons5_qt.po similarity index 100% rename from po/sk/kdbusaddons5_qt.po rename to poqm/sk/kdbusaddons5_qt.po diff --git a/po/sl/kdbusaddons5_qt.po b/poqm/sl/kdbusaddons5_qt.po similarity index 100% rename from po/sl/kdbusaddons5_qt.po rename to poqm/sl/kdbusaddons5_qt.po diff --git a/po/sr/kdbusaddons5_qt.po b/poqm/sr/kdbusaddons5_qt.po similarity index 100% rename from po/sr/kdbusaddons5_qt.po rename to poqm/sr/kdbusaddons5_qt.po diff --git a/po/sr@ijekavian/kdbusaddons5_qt.po b/poqm/sr@ijekavian/kdbusaddons5_qt.po similarity index 100% rename from po/sr@ijekavian/kdbusaddons5_qt.po rename to poqm/sr@ijekavian/kdbusaddons5_qt.po diff --git a/po/sr@ijekavianlatin/kdbusaddons5_qt.po b/poqm/sr@ijekavianlatin/kdbusaddons5_qt.po similarity index 100% rename from po/sr@ijekavianlatin/kdbusaddons5_qt.po rename to poqm/sr@ijekavianlatin/kdbusaddons5_qt.po diff --git a/po/sr@latin/kdbusaddons5_qt.po b/poqm/sr@latin/kdbusaddons5_qt.po similarity index 100% rename from po/sr@latin/kdbusaddons5_qt.po rename to poqm/sr@latin/kdbusaddons5_qt.po diff --git a/po/sv/kdbusaddons5_qt.po b/poqm/sv/kdbusaddons5_qt.po similarity index 100% rename from po/sv/kdbusaddons5_qt.po rename to poqm/sv/kdbusaddons5_qt.po diff --git a/po/tg/kdbusaddons5_qt.po b/poqm/tg/kdbusaddons5_qt.po similarity index 100% rename from po/tg/kdbusaddons5_qt.po rename to poqm/tg/kdbusaddons5_qt.po diff --git a/po/tr/kdbusaddons5_qt.po b/poqm/tr/kdbusaddons5_qt.po similarity index 78% rename from po/tr/kdbusaddons5_qt.po rename to poqm/tr/kdbusaddons5_qt.po index 9ed0efd..c04ea57 100644 --- a/po/tr/kdbusaddons5_qt.po +++ b/poqm/tr/kdbusaddons5_qt.po @@ -1,10 +1,17 @@ +# Emir SARI , 2022. msgid "" msgstr "" +"Project-Id-Version: \n" +"PO-Revision-Date: 2022-03-29 13:55+0300\n" +"Last-Translator: Emir SARI \n" +"Language-Team: Turkish \n" +"Language: tr\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-Qt-Contexts: true\n" +"X-Generator: Lokalize 21.12.3\n" #: tools/kquitapp/kquitapp.cpp:19 msgctxt "main|" @@ -14,7 +21,7 @@ msgstr "D-Bus desteği olan bir uygulamadan kolayca çıkın" #: tools/kquitapp/kquitapp.cpp:21 msgctxt "main|" msgid "Full service name, overrides application name provided" -msgstr "Tam servis adı, verilen uygulama isminin yerine geçer" +msgstr "Tam servis adı, verilen uygulama adının yerine geçer" #: tools/kquitapp/kquitapp.cpp:24 msgctxt "main|" diff --git a/po/uk/kdbusaddons5_qt.po b/poqm/uk/kdbusaddons5_qt.po similarity index 100% rename from po/uk/kdbusaddons5_qt.po rename to poqm/uk/kdbusaddons5_qt.po diff --git a/po/zh_CN/kdbusaddons5_qt.po b/poqm/zh_CN/kdbusaddons5_qt.po similarity index 94% rename from po/zh_CN/kdbusaddons5_qt.po rename to poqm/zh_CN/kdbusaddons5_qt.po index 74702e8..1fae32e 100644 --- a/po/zh_CN/kdbusaddons5_qt.po +++ b/poqm/zh_CN/kdbusaddons5_qt.po @@ -1,8 +1,7 @@ -# Weng Xuetian , 2014. msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2021-12-22 14:05\n" +"PO-Revision-Date: 2023-01-12 10:30\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff --git a/po/zh_TW/kdbusaddons5_qt.po b/poqm/zh_TW/kdbusaddons5_qt.po similarity index 100% rename from po/zh_TW/kdbusaddons5_qt.po rename to poqm/zh_TW/kdbusaddons5_qt.po diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8f39022..1c35e79 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,8 +6,6 @@ add_library(KF5::DBusAddons ALIAS KF5DBusAddons) ecm_create_qm_loader(KF5DBusAddons kdbusaddons5_qt) target_sources(KF5DBusAddons PRIVATE - kdbusconnectionpool.cpp - kdbusconnectionpool.h kdbusinterprocesslock.cpp kdbusinterprocesslock.h kdbusservice.cpp @@ -19,6 +17,13 @@ target_sources(KF5DBusAddons PRIVATE updatelaunchenvironmentjob.cpp updatelaunchenvironmentjob.h ) +if (QT_MAJOR_VERSION EQUAL "5") + target_sources(KF5DBusAddons PRIVATE + kdbusconnectionpool.cpp + kdbusconnectionpool.h + ) +endif() + ecm_qt_declare_logging_category(KF5DBusAddons HEADER kdbusaddons_debug.h IDENTIFIER KDBUSADDONS_LOG @@ -77,7 +82,6 @@ configure_file(config-kdbusaddons.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdb ecm_generate_headers(KDBusAddons_HEADERS HEADER_NAMES - KDBusConnectionPool KDBusInterProcessLock KDBusService KDEDModule @@ -85,29 +89,19 @@ ecm_generate_headers(KDBusAddons_HEADERS UpdateLaunchEnvironmentJob REQUIRED_HEADERS KDBusAddons_HEADERS ) - -find_package(PythonModuleGeneration) - -if (PythonModuleGeneration_FOUND) - ecm_generate_python_binding( - TARGET KF5::DBusAddons - PYTHONNAMESPACE PyKF5 - MODULENAME KDBusAddons - SIP_DEPENDS - QtDBus/QtDBusmod.sip - HEADERS - kdbusconnectionpool.h - kdbusinterprocesslock.h - kdbusservice.h - kdedmodule.h - kdeinitinterface.h - ) +if (QT_MAJOR_VERSION EQUAL "5") + ecm_generate_headers(KDBusAddons_Legacy_HEADERS + HEADER_NAMES + KDBusConnectionPool + REQUIRED_HEADERS KDBusAddons_Legacy_HEADERS + ) endif() -install(TARGETS KF5DBusAddons EXPORT KF5DBusAddonsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS KF5DBusAddons EXPORT KF5DBusAddonsTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES ${KDBusAddons_HEADERS} + ${KDBusAddons_Legacy_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/kdbusaddons_export.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KDBusAddons COMPONENT Devel ) diff --git a/src/kdbusservice.h b/src/kdbusservice.h index 61e6730..896ad48 100644 --- a/src/kdbusservice.h +++ b/src/kdbusservice.h @@ -229,14 +229,19 @@ class KDBUSADDONS_EXPORT KDBusService : public QObject * from QX11Info::nextStartupId(), if there is one. * For Wayland, KDBusService provides the token for the XDG Activation protocol in the * "XDG_ACTIVATION_TOKEN" environment variable and unsets it again after the signal, if there is one. + * The util method @c KWindowSystem::updateStartupId(QWindow *window) (since KF 5.91) takes care of that. * A typical implementation in the signal handler would be: * @code * mainWindow->show(); + * #if KWINDOWSYSTEM_VERSION >= QT_VERSION_CHECK(5, 91, 0) + * KWindowSystem::updateStartupId(mainWindow->windowHandle()); + * #else * if (KWindowSystem::isPlatformX11()) { * KStartupInfo::setNewStartupId(mainWindow->windowHandle(), QX11Info::nextStartupId()); * } else if (KWindowSystem::isPlatformWayland()) { * KWindowSystem::setCurrentXdgActivationToken(qEnvironmentVariable("XDG_ACTIVATION_TOKEN")); * } + * #endif * mainWindow->raise(); * KWindowSystem::activateWindow(mainWindow->windowHandle()); * @endcode diff --git a/src/kdedmodule.cpp b/src/kdedmodule.cpp index 744a0bf..75de753 100644 --- a/src/kdedmodule.cpp +++ b/src/kdedmodule.cpp @@ -65,7 +65,10 @@ void KDEDModule::setModuleName(const QString &name) } else { // qCDebug(KDBUSADDONS_LOG) << "registerObject() successful for" << d->moduleName; // Fix deadlock with Qt 5.6: this has to be delayed until the dbus thread is unlocked - QMetaObject::invokeMethod(this, "moduleRegistered", Qt::QueuedConnection, Q_ARG(QDBusObjectPath, realPath)); + auto registeredSignal = [this, realPath]() { + moduleRegistered(realPath); + }; + QMetaObject::invokeMethod(this, registeredSignal, Qt::QueuedConnection); } } diff --git a/src/kdedmodule.h b/src/kdedmodule.h index 91733fa..69cbcac 100644 --- a/src/kdedmodule.h +++ b/src/kdedmodule.h @@ -25,10 +25,11 @@ class QDBusMessage; * * The base class for KDED modules. * - * KDED modules are realized as shared - * libraries that are loaded on-demand into kded at runtime. + * KDED modules are constructed as shared libraries that are loaded on-demand + * into the kded daemon at runtime. * - * See kdelibs/kded/HOWTO for documentation about writing kded modules. + * See https://invent.kde.org/frameworks/kded/-/blob/master/docs/HOWTO + * for documentation about writing kded modules. * * @author Waldo Bastian */ diff --git a/src/tools/kquitapp/CMakeLists.txt b/src/tools/kquitapp/CMakeLists.txt index 6d5d8a0..7adbd0d 100644 --- a/src/tools/kquitapp/CMakeLists.txt +++ b/src/tools/kquitapp/CMakeLists.txt @@ -1,4 +1,4 @@ add_executable(kquitapp5 kquitapp.cpp) ecm_mark_nongui_executable(kquitapp5) target_link_libraries(kquitapp5 Qt${QT_MAJOR_VERSION}::DBus) -install(TARGETS kquitapp5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS kquitapp5 ${KF_INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/src/updatelaunchenvironmentjob.cpp b/src/updatelaunchenvironmentjob.cpp index 3cc9230..341196f 100644 --- a/src/updatelaunchenvironmentjob.cpp +++ b/src/updatelaunchenvironmentjob.cpp @@ -16,10 +16,10 @@ #include "kdbusaddons_debug.h" -class Q_DECL_HIDDEN UpdateLaunchEnvironmentJob::Private +class UpdateLaunchEnvironmentJobPrivate { public: - explicit Private(UpdateLaunchEnvironmentJob *q); + explicit UpdateLaunchEnvironmentJobPrivate(UpdateLaunchEnvironmentJob *q); void monitorReply(const QDBusPendingReply<> &reply); static bool isPosixName(const QString &name); @@ -30,12 +30,12 @@ class Q_DECL_HIDDEN UpdateLaunchEnvironmentJob::Private int pendingReplies = 0; }; -UpdateLaunchEnvironmentJob::Private::Private(UpdateLaunchEnvironmentJob *q) +UpdateLaunchEnvironmentJobPrivate::UpdateLaunchEnvironmentJobPrivate(UpdateLaunchEnvironmentJob *q) : q(q) { } -void UpdateLaunchEnvironmentJob::Private::monitorReply(const QDBusPendingReply<> &reply) +void UpdateLaunchEnvironmentJobPrivate::monitorReply(const QDBusPendingReply<> &reply) { ++pendingReplies; @@ -51,17 +51,15 @@ void UpdateLaunchEnvironmentJob::Private::monitorReply(const QDBusPendingReply<> }); } +// KF6 TODO: add K-prefix to class name UpdateLaunchEnvironmentJob::UpdateLaunchEnvironmentJob(const QProcessEnvironment &environment) - : d(new Private(this)) + : d(new UpdateLaunchEnvironmentJobPrivate(this)) { d->environment = environment; QTimer::singleShot(0, this, &UpdateLaunchEnvironmentJob::start); } -UpdateLaunchEnvironmentJob::~UpdateLaunchEnvironmentJob() -{ - delete d; -} +UpdateLaunchEnvironmentJob::~UpdateLaunchEnvironmentJob() = default; void UpdateLaunchEnvironmentJob::start() { @@ -70,7 +68,7 @@ void UpdateLaunchEnvironmentJob::start() QStringList systemdUpdates; for (const auto &varName : d->environment.keys()) { - if (!Private::isPosixName(varName)) { + if (!UpdateLaunchEnvironmentJobPrivate::isPosixName(varName)) { qCWarning(KDBUSADDONS_LOG) << "Skipping syncing of environment variable " << varName << "as name contains unsupported characters"; continue; } @@ -101,7 +99,7 @@ void UpdateLaunchEnvironmentJob::start() // Systemd has stricter parsing of valid environment variables // https://github.com/systemd/systemd/issues/16704 // validate here - if (!Private::isSystemdApprovedValue(value)) { + if (!UpdateLaunchEnvironmentJobPrivate::isSystemdApprovedValue(value)) { qCWarning(KDBUSADDONS_LOG) << "Skipping syncing of environment variable " << varName << "as value contains unsupported characters"; continue; } @@ -130,7 +128,7 @@ void UpdateLaunchEnvironmentJob::start() d->monitorReply(systemdActivationReply); } -bool UpdateLaunchEnvironmentJob::Private::isPosixName(const QString &name) +bool UpdateLaunchEnvironmentJobPrivate::isPosixName(const QString &name) { // Posix says characters like % should be 'tolerated', but it gives issues in practice. // https://bugzilla.redhat.com/show_bug.cgi?id=1754395 @@ -149,7 +147,7 @@ bool UpdateLaunchEnvironmentJob::Private::isPosixName(const QString &name) return !first; } -bool UpdateLaunchEnvironmentJob::Private::isSystemdApprovedValue(const QString &value) +bool UpdateLaunchEnvironmentJobPrivate::isSystemdApprovedValue(const QString &value) { // systemd code checks that a value contains no control characters except \n \t // effectively copied from systemd's string_has_cc diff --git a/src/updatelaunchenvironmentjob.h b/src/updatelaunchenvironmentjob.h index 6721bb9..b792919 100644 --- a/src/updatelaunchenvironmentjob.h +++ b/src/updatelaunchenvironmentjob.h @@ -11,9 +11,14 @@ #include +#include + class QString; +class UpdateLaunchEnvironmentJobPrivate; /** + * @class UpdateLaunchEnvironmentJob updatelaunchenvironmentjob.h + * * Job for updating the launch environment. * * This job adds or updates an environment variable in process environment that will be used @@ -43,6 +48,7 @@ class KDBUSADDONS_EXPORT UpdateLaunchEnvironmentJob : public QObject private: void start(); - class Private; - Private *const d; + +private: + std::unique_ptr const d; };