Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kcmutils for openSUSE:Factory checked in at 2021-02-17 18:10:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcmutils (Old) and /work/SRC/openSUSE:Factory/.kcmutils.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcmutils" Wed Feb 17 18:10:19 2021 rev:90 rq:871673 version:5.79.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcmutils/kcmutils.changes 2021-01-13 18:17:12.496989660 +0100 +++ /work/SRC/openSUSE:Factory/.kcmutils.new.28504/kcmutils.changes 2021-02-17 18:11:33.693941662 +0100 @@ -1,0 +2,11 @@ +Mon Feb 8 08:46:03 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 +- Changes since 5.78.0: + * Ensure single column mode + * remove window dragging hack + +------------------------------------------------------------------- Old: ---- kcmutils-5.78.0.tar.xz kcmutils-5.78.0.tar.xz.sig New: ---- kcmutils-5.79.0.tar.xz kcmutils-5.79.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcmutils.spec ++++++ --- /var/tmp/diff_new_pack.Q1jSgD/_old 2021-02-17 18:11:34.353942202 +0100 +++ /var/tmp/diff_new_pack.Q1jSgD/_new 2021-02-17 18:11:34.357942205 +0100 @@ -17,14 +17,14 @@ %define lname libKF5KCMUtils5 -%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: kcmutils -Version: 5.78.0 +Version: 5.79.0 Release: 0 Summary: Classes to work with KCModules License: LGPL-2.1-or-later ++++++ kcmutils-5.78.0.tar.xz -> kcmutils-5.79.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.78.0/.gitignore new/kcmutils-5.79.0/.gitignore --- old/kcmutils-5.78.0/.gitignore 2021-01-02 14:07:55.000000000 +0100 +++ new/kcmutils-5.79.0/.gitignore 2021-02-06 19:10:51.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/kcmutils-5.78.0/CMakeLists.txt new/kcmutils-5.79.0/CMakeLists.txt --- old/kcmutils-5.78.0/CMakeLists.txt 2021-01-02 14:07:55.000000000 +0100 +++ new/kcmutils-5.79.0/CMakeLists.txt 2021-02-06 19:10:51.000000000 +0100 @@ -1,11 +1,11 @@ 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(KCMUtils 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(KCMUtils VERSION ${KF_VERSION}) 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) @@ -35,14 +35,14 @@ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5KCMUtilsConfigVersion.cmake" SOVERSION 5) -find_package(KF5ItemViews ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5ConfigWidgets ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5GuiAddons ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5Service ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5XmlGui ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5Declarative ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5ItemViews ${KF_DEP_VERSION} REQUIRED) +find_package(KF5ConfigWidgets ${KF_DEP_VERSION} REQUIRED) +find_package(KF5CoreAddons ${KF_DEP_VERSION} REQUIRED) +find_package(KF5GuiAddons ${KF_DEP_VERSION} REQUIRED) +find_package(KF5I18n ${KF_DEP_VERSION} REQUIRED) +find_package(KF5Service ${KF_DEP_VERSION} REQUIRED) +find_package(KF5XmlGui ${KF_DEP_VERSION} REQUIRED) +find_package(KF5Declarative ${KF_DEP_VERSION} REQUIRED) ecm_setup_qtplugin_macro_names( JSON_NONE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.78.0/KF5KCMUtilsConfig.cmake.in new/kcmutils-5.79.0/KF5KCMUtilsConfig.cmake.in --- old/kcmutils-5.78.0/KF5KCMUtilsConfig.cmake.in 2021-01-02 14:07:55.000000000 +0100 +++ new/kcmutils-5.79.0/KF5KCMUtilsConfig.cmake.in 2021-02-06 19:10:51.000000000 +0100 @@ -1,8 +1,8 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(KF5ConfigWidgets "@KF5_DEP_VERSION@") -find_dependency(KF5Service "@KF5_DEP_VERSION@") +find_dependency(KF5ConfigWidgets "@KF_DEP_VERSION@") +find_dependency(KF5Service "@KF_DEP_VERSION@") @PACKAGE_SETUP_AUTOMOC_VARIABLES@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.78.0/po/nb/kcmutils5.po new/kcmutils-5.79.0/po/nb/kcmutils5.po --- old/kcmutils-5.78.0/po/nb/kcmutils5.po 2021-01-02 14:07:55.000000000 +0100 +++ new/kcmutils-5.79.0/po/nb/kcmutils5.po 2021-02-06 19:10:51.000000000 +0100 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2020-10-24 02:11+0200\n" +"POT-Creation-Date: 2020-12-19 02:16+0100\n" "PO-Revision-Date: 2014-11-05 13:40+0100\n" "Last-Translator: Bj??rn Steensrud <bjor...@skogkatt.homelinux.org>\n" "Language-Team: Norwegian Bokm??l <l10n...@lister.huftis.org>\n" @@ -79,7 +79,7 @@ "qt>" msgstr "<qt>Diagnosen er: <br />Skrivebordsfila %1 er ikke et bibliotek. </qt>" -#: kcmoduleloader.cpp:194 +#: kcmoduleloader.cpp:186 #, kde-format msgid "" "<qt><p>Possible reasons:<ul><li>An error occurred during your last system " @@ -109,7 +109,7 @@ msgid "Apply Settings" msgstr "Ta i bruk endringer" -#: kcmultidialog.cpp:225 kpluginselector.cpp:759 +#: kcmultidialog.cpp:225 kpluginselector.cpp:783 #, kde-format msgid "Configure" msgstr "Oppsett" @@ -417,7 +417,7 @@ msgid "The size of the dialog" msgstr "St??rrelse p?? dialogvinduet" -#: kpluginselector.cpp:128 +#: kpluginselector.cpp:130 #, kde-format msgid "" "Automatic changes have been performed due to plugin dependencies. Click here " @@ -426,7 +426,7 @@ "Endringer er blitt gjort automatisk p?? grunn av avhengigheter mellom " "programtillegg. Trykk her for ?? f?? mer informasjon" -#: kpluginselector.cpp:196 +#: kpluginselector.cpp:198 #, kde-format msgid "" "Automatic changes have been performed in order to satisfy plugin " @@ -435,7 +435,7 @@ "Endringer er blitt gjort automatisk for ?? l??se opp avhengigheter mellom " "programtilleggene:\n" -#: kpluginselector.cpp:200 +#: kpluginselector.cpp:202 #, kde-format msgid "" "\n" @@ -446,7 +446,7 @@ " ....programtillegget %1 er automatisk valgt p?? grunn av at det avhenger av " "programtillegget %2" -#: kpluginselector.cpp:202 +#: kpluginselector.cpp:204 #, kde-format msgid "" "\n" @@ -457,12 +457,12 @@ " ....programtillegget %1 er automatisk fravalgt p?? grunn av at det avhenger " "av programtillegget %2" -#: kpluginselector.cpp:205 +#: kpluginselector.cpp:207 #, kde-format msgid "Dependency Check" msgstr "Sjekk for avhengigheter" -#: kpluginselector.cpp:222 +#: kpluginselector.cpp:224 #, kde-format msgid "%1 plugin automatically added due to plugin dependencies" msgid_plural "%1 plugins automatically added due to plugin dependencies" @@ -473,12 +473,12 @@ "%1 programtillegg lagt til automatisk p?? grunn av avhengigheter mellom " "programtillegg" -#: kpluginselector.cpp:226 +#: kpluginselector.cpp:228 #, kde-format msgid ", " msgstr ", " -#: kpluginselector.cpp:230 +#: kpluginselector.cpp:232 #, kde-format msgid "%1 plugin automatically removed due to plugin dependencies" msgid_plural "%1 plugins automatically removed due to plugin dependencies" @@ -489,12 +489,12 @@ "%1 programtillegg fjernet automatisk p?? grunn av avhengigheter mellom " "programtillegg" -#: kpluginselector.cpp:250 +#: kpluginselector.cpp:252 #, kde-format msgid "Search..." msgstr "" -#: kpluginselector.cpp:754 +#: kpluginselector.cpp:778 #, kde-format msgid "About" msgstr "Om" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.78.0/po/nn/kcmutils5.po new/kcmutils-5.79.0/po/nn/kcmutils5.po --- old/kcmutils-5.78.0/po/nn/kcmutils5.po 2021-01-02 14:07:55.000000000 +0100 +++ new/kcmutils-5.79.0/po/nn/kcmutils5.po 2021-02-06 19:10:51.000000000 +0100 @@ -2,21 +2,21 @@ # # Gaute Hvoslef Kvalnes <ga...@verdsveven.com>, 2003, 2004, 2005, 2006. # H??vard Korsvoll <korsv...@skulelinux.no>, 2003, 2005. -# Karl Ove Hufthammer <k...@huftis.org>, 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2019, 2020. +# Karl Ove Hufthammer <k...@huftis.org>, 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2019, 2020, 2021. # Eirik U. Birkeland <eir...@gmail.com>, 2008, 2009, 2010. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2020-12-18 02:14+0100\n" -"PO-Revision-Date: 2020-11-21 18:10+0100\n" +"POT-Creation-Date: 2020-12-19 02:16+0100\n" +"PO-Revision-Date: 2021-01-12 21:44+0100\n" "Last-Translator: Karl Ove Hufthammer <k...@huftis.org>\n" "Language-Team: Norwegian Nynorsk <l10n...@lister.huftis.org>\n" "Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 20.08.3\n" +"X-Generator: Lokalize 20.12.1\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" @@ -77,7 +77,7 @@ "<qt>Diagnosen er: <br />Skrivebordsfila %1 oppgjev ikkje noko bibliotek. </" "qt>" -#: kcmoduleloader.cpp:194 +#: kcmoduleloader.cpp:186 #, kde-format msgid "" "<qt><p>Possible reasons:<ul><li>An error occurred during your last system " @@ -86,12 +86,12 @@ "carefully and try to remove the module mentioned in the error message. If " "this fails, consider contacting your distributor or packager.</p></qt>" msgstr "" -"<qt><p>Moglege grunnar:<ul><li>Det oppstod ein feil under den siste " -"systemoppgraderinga som etterl??t ein styringsmodul utan tilh??yrsle.</" -"li><li>Du har gamle tredjeparts-modular liggande.</li></ul></p><p>Unders??k " -"dette grundig og fors??k ?? fjerna modulen som er nemnt i feilmeldinga. Viss " -"dette ikkje lukkast, b??r du kanskje kontakta distribut??ren din eller " -"pakkebyggjaren.</p></qt>" +"<qt><p>Moglege grunnar:<ul><li>Det oppstod ein feil under den siste system??" +"oppgraderinga som etterl??t ein styrings??modul utan tilh??yrsle.</li><li>Du har " +"gamle tredjeparts-modular liggjande.</li></ul></p><p>Unders??k dette grundig " +"og fors??k ?? fjerna modulen som er nemnt i feilmeldinga. Viss dette ikkje " +"lukkast, kan du vurdera ?? kontakta distribut??ren din eller pakkebyggjaren.</" +"p></qt>" #: kcmoduleproxy.cpp:107 #, kde-format @@ -111,7 +111,7 @@ #: kcmultidialog.cpp:52 #, kde-format msgid "Apply Settings" -msgstr "Bruk innstillingar" +msgstr "Bruk innstillingane" #: kcmultidialog.cpp:225 kpluginselector.cpp:783 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.78.0/po/pl/kcmutils5.po new/kcmutils-5.79.0/po/pl/kcmutils5.po --- old/kcmutils-5.78.0/po/pl/kcmutils5.po 2021-01-02 14:07:55.000000000 +0100 +++ new/kcmutils-5.79.0/po/pl/kcmutils5.po 2021-02-06 19:10:51.000000000 +0100 @@ -11,13 +11,13 @@ # Marta Rybczy??ska <kde-i...@rybczynska.net>, 2007, 2008, 2009, 2010, 2011, 2012, 2013. # Michal Rudolf <mic...@rudolf.waw.pl>, 2010. # Artur Ch??ond <eugenewo...@o2.pl>, 2010. -# ??ukasz Wojni??owicz <lukasz.wojnilow...@gmail.com>, 2011, 2012, 2013, 2014, 2015, 2016, 2018, 2019. +# ??ukasz Wojni??owicz <lukasz.wojnilow...@gmail.com>, 2011, 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2021. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-12-19 02:16+0100\n" -"PO-Revision-Date: 2019-10-20 11:42+0200\n" +"PO-Revision-Date: 2021-01-06 01:36+0100\n" "Last-Translator: ??ukasz Wojni??owicz <lukasz.wojnilow...@gmail.com>\n" "Language-Team: Polish <kde-i18n-...@kde.org>\n" "Language: pl\n" @@ -108,7 +108,7 @@ ">\n" ">\n" ">\n" -"X-Generator: Lokalize 19.07.70\n" +"X-Generator: Lokalize 20.12.1\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -571,7 +571,7 @@ #: kpluginselector.cpp:252 #, kde-format msgid "Search..." -msgstr "Znajd??..." +msgstr "Szukaj..." #: kpluginselector.cpp:778 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.78.0/po/se/kcmutils5.po new/kcmutils-5.79.0/po/se/kcmutils5.po --- old/kcmutils-5.78.0/po/se/kcmutils5.po 2021-01-02 14:07:55.000000000 +0100 +++ new/kcmutils-5.79.0/po/se/kcmutils5.po 2021-02-06 19:10:51.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2020-10-24 02:11+0200\n" +"POT-Creation-Date: 2020-12-19 02:16+0100\n" "PO-Revision-Date: 2012-05-30 23:19+0200\n" "Last-Translator: B??rre Gaup <boe...@skolelinux.no>\n" "Language-Team: Northern Sami <l10n...@lister.huftis.org>\n" @@ -73,7 +73,7 @@ msgstr "" "<qt>Diagnosa lea:<br />????llinbeavdefiillas %1 ii mero??tuvvo bibliotehka.</qt>" -#: kcmoduleloader.cpp:194 +#: kcmoduleloader.cpp:186 #, kde-format msgid "" "<qt><p>Possible reasons:<ul><li>An error occurred during your last system " @@ -103,7 +103,7 @@ msgid "Apply Settings" msgstr "Geavat heivehusaid" -#: kcmultidialog.cpp:225 kpluginselector.cpp:759 +#: kcmultidialog.cpp:225 kpluginselector.cpp:783 #, kde-format msgid "Configure" msgstr "Heivet" @@ -408,7 +408,7 @@ msgid "The size of the dialog" msgstr "L??se??a sturrodat" -#: kpluginselector.cpp:128 +#: kpluginselector.cpp:130 #, kde-format msgid "" "Automatic changes have been performed due to plugin dependencies. Click here " @@ -417,7 +417,7 @@ "Lea dahkan rievdadusaid autom??htala????at lassemodulasorjjasvuo??aid dihte. " "Oa????ut eanet die??uid go coahkkalat d??kko" -#: kpluginselector.cpp:196 +#: kpluginselector.cpp:198 #, kde-format msgid "" "Automatic changes have been performed in order to satisfy plugin " @@ -425,7 +425,7 @@ msgstr "" "Lea dahkan rievdadusaid autom??htala????at lassemodulasorjjasvuo??aid dihte:\n" -#: kpluginselector.cpp:200 +#: kpluginselector.cpp:202 #, kde-format msgid "" "\n" @@ -436,7 +436,7 @@ " %1-lassemodula merkejuvvui autom??htala????at dannego das lea " "sorjjasvuohta??%2-lassemodulii" -#: kpluginselector.cpp:202 +#: kpluginselector.cpp:204 #, kde-format msgid "" "\n" @@ -447,12 +447,12 @@ " %1-lassemodula mearka v??ldui eret autom??htala????at dannego das lea " "sorjjasvuohta %2-lassemodulii" -#: kpluginselector.cpp:205 +#: kpluginselector.cpp:207 #, kde-format msgid "Dependency Check" msgstr "Sorjjasvuohta iskkus" -#: kpluginselector.cpp:222 +#: kpluginselector.cpp:224 #, kde-format msgid "%1 plugin automatically added due to plugin dependencies" msgid_plural "%1 plugins automatically added due to plugin dependencies" @@ -463,12 +463,12 @@ "%1-lassemodula lasihuvvui autom??htala????at dannego leat " "lassemodulasorjjasvuo??at" -#: kpluginselector.cpp:226 +#: kpluginselector.cpp:228 #, kde-format msgid ", " msgstr ", " -#: kpluginselector.cpp:230 +#: kpluginselector.cpp:232 #, kde-format msgid "%1 plugin automatically removed due to plugin dependencies" msgid_plural "%1 plugins automatically removed due to plugin dependencies" @@ -479,12 +479,12 @@ "%1 lassemodula v??ldui autom??htala????at eret dannego leat " "lassemodulasorjjasvuo??at" -#: kpluginselector.cpp:250 +#: kpluginselector.cpp:252 #, kde-format msgid "Search..." msgstr "" -#: kpluginselector.cpp:754 +#: kpluginselector.cpp:778 #, kde-format msgid "About" msgstr "Die??ut" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.78.0/po/zh_CN/kcmutils5.po new/kcmutils-5.79.0/po/zh_CN/kcmutils5.po --- old/kcmutils-5.78.0/po/zh_CN/kcmutils5.po 2021-01-02 14:07:55.000000000 +0100 +++ new/kcmutils-5.79.0/po/zh_CN/kcmutils5.po 2021-02-06 19:10:51.000000000 +0100 @@ -15,7 +15,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-12-19 02:16+0100\n" -"PO-Revision-Date: 2021-01-01 14:21\n" +"PO-Revision-Date: 2021-02-04 11:58\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.78.0/src/CMakeLists.txt new/kcmutils-5.79.0/src/CMakeLists.txt --- old/kcmutils-5.78.0/src/CMakeLists.txt 2021-01-02 14:07:55.000000000 +0100 +++ new/kcmutils-5.79.0/src/CMakeLists.txt 2021-02-06 19:10:51.000000000 +0100 @@ -27,7 +27,7 @@ ecm_generate_export_header(KF5KCMUtils BASE_NAME KCMUtils GROUP_BASE_NAME KF - VERSION ${KF5_VERSION} + VERSION ${KF_VERSION} DEPRECATED_BASE_VERSION 0 DEPRECATION_VERSIONS 5.66 5.76 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} @@ -102,7 +102,7 @@ KF5KCMUtils_QCH NAME KCMUtils BASE_NAME KF5KCMUtils - VERSION ${KF5_VERSION} + VERSION ${KF_VERSION} ORG_DOMAIN org.kde SOURCES # using only public headers, to cover only public API ${KCMUtils_HEADERS} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.78.0/src/kcmodulecontainer.cpp new/kcmutils-5.79.0/src/kcmodulecontainer.cpp --- old/kcmutils-5.78.0/src/kcmodulecontainer.cpp 2021-01-02 14:07:55.000000000 +0100 +++ new/kcmutils-5.79.0/src/kcmodulecontainer.cpp 2021-02-06 19:10:51.000000000 +0100 @@ -50,11 +50,7 @@ /***********************************************************************/ KCModuleContainer::KCModuleContainer(QWidget *parent, const QString &mods) : KCModule(parent), -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - d(new KCModuleContainerPrivate(QString(mods).remove(QLatin1Char(' ')).split(QLatin1Char(','), QString::SkipEmptyParts))) -#else d(new KCModuleContainerPrivate(QString(mods).remove(QLatin1Char(' ')).split(QLatin1Char(','), Qt::SkipEmptyParts))) -#endif { init(); } @@ -133,7 +129,7 @@ (*it)->save(); } - emit changed(false); + Q_EMIT changed(false); } @@ -145,7 +141,7 @@ (*it)->load(); } - emit changed(false); + Q_EMIT changed(false); } void KCModuleContainer::defaults() @@ -156,7 +152,7 @@ (*it)->defaults(); } - emit changed(true); + Q_EMIT changed(true); } void KCModuleContainer::moduleChanged(KCModuleProxy *proxy) @@ -166,7 +162,7 @@ return; } - emit changed(true); + Q_EMIT changed(true); } KCModuleContainer::~KCModuleContainer() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.78.0/src/kcmoduleproxy.cpp new/kcmutils-5.79.0/src/kcmoduleproxy.cpp --- old/kcmutils-5.78.0/src/kcmoduleproxy.cpp 2021-01-02 14:07:55.000000000 +0100 +++ new/kcmutils-5.79.0/src/kcmoduleproxy.cpp 2021-02-06 19:10:51.000000000 +0100 @@ -168,8 +168,8 @@ Q_Q(KCModuleProxy); changed = c; - emit q->changed(c); - emit q->changed(q); + Q_EMIT q->changed(c); + Q_EMIT q->changed(q); } void KCModuleProxyPrivate::_k_moduleDefaulted(bool d) @@ -180,8 +180,8 @@ Q_Q(KCModuleProxy); defaulted = d; - emit q->changed(changed); - emit q->changed(q); + Q_EMIT q->changed(changed); + Q_EMIT q->changed(q); } void KCModuleProxyPrivate::_k_moduleDestroyed() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.78.0/src/kcmoduleqml.cpp new/kcmutils-5.79.0/src/kcmoduleqml.cpp --- old/kcmutils-5.78.0/src/kcmoduleqml.cpp 2021-01-02 14:07:55.000000000 +0100 +++ new/kcmutils-5.79.0/src/kcmoduleqml.cpp 2021-02-06 19:10:51.000000000 +0100 @@ -68,13 +68,13 @@ }); if (d->configModule->needsSave()) { - emit changed(true); + Q_EMIT changed(true); } connect(d->configModule.get(), &KQuickAddons::ConfigModule::needsSaveChanged, this, [=] { - emit changed(d->configModule->needsSave()); + Q_EMIT changed(d->configModule->needsSave()); }); connect(d->configModule.get(), &KQuickAddons::ConfigModule::representsDefaultsChanged, this, [=] { - emit defaulted(d->configModule->representsDefaults()); + Q_EMIT defaulted(d->configModule->representsDefaults()); }); setNeedsAuthorization(d->configModule->needsAuthorization()); @@ -130,7 +130,7 @@ import QtQuick 2.3 import QtQuick.Window 2.2 import QtQuick.Controls 2.2 -import org.kde.kirigami 2.4 as Kirigami +import org.kde.kirigami 2.14 as Kirigami Kirigami.ApplicationItem { //force it to *never* try to resize itself @@ -142,6 +142,8 @@ activeFocusOnTab: true controlsVisible: false + property QtObject kcm + ToolButton { id:toolButton visible: false @@ -150,9 +152,17 @@ pageStack.separatorVisible: false pageStack.globalToolBar.preferredHeight: toolButton.implicitHeight + Kirigami.Units.smallSpacing * 2 - pageStack.globalToolBar.style: pageStack.wideScreen ? Kirigami.ApplicationHeaderStyle.Titles : Kirigami.ApplicationHeaderStyle.Breadcrumb + pageStack.globalToolBar.style: pageStack.wideMode && pageStack.columnView.columnResizeMode !== Kirigami.ColumnView.SingleColumn + ? Kirigami.ApplicationHeaderStyle.Titles + : Kirigami.ApplicationHeaderStyle.Breadcrumb pageStack.globalToolBar.showNavigationButtons: true + pageStack.columnView.columnResizeMode: pageStack.items.length > 0 && pageStack.items[0].Kirigami.ColumnView.fillWidth + ? Kirigami.ColumnView.SingleColumn + : Kirigami.ColumnView.FixedColumns + + pageStack.defaultColumnWidth: kcm && kcm.columnWidth > 0 ? kcm.columnWidth : Kirigami.Units.gridUnit * 20 + Keys.onReturnPressed: { event.accepted = true } @@ -167,6 +177,7 @@ qCCritical(KCMUTILS_LOG) << component->errors(); qFatal("Failed to intiailize KCModuleQML"); } + d->rootPlaceHolder->setProperty("kcm", QVariant::fromValue(d->configModule.get())); d->rootPlaceHolder->installEventFilter(this); d->quickWidget->setContent(QUrl(), component, d->rootPlaceHolder); @@ -197,16 +208,6 @@ //New syntax cannot be used to connect to QML types connect(d->pageRow, SIGNAL(currentIndexChanged()), this, SLOT(syncCurrentIndex())); - auto syncColumnWidth = [this](){ - d->pageRow->setProperty("defaultColumnWidth", d->configModule->columnWidth() > 0 ? d->configModule->columnWidth() : d->rootPlaceHolder->width()); - }; - syncColumnWidth(); - - connect(d->configModule.get(), &KQuickAddons::ConfigModule::columnWidthChanged, - this, syncColumnWidth); - connect(d->rootPlaceHolder, &QQuickItem::widthChanged, - this, syncColumnWidth); - } layout->addWidget(d->quickWidget); @@ -240,19 +241,6 @@ return KCModule::eventFilter(watched, event); } -bool KCModuleQml::event(QEvent *event) -{ - // more QQuickWidget hacks - // if a mouse press is handled by the new input handlers it is not accepted - // this causes the breeze style to start a window drag - // mark all mouse events as accepted after being processed - bool rc = KCModule::event(event); - if (event->type () == QEvent::MouseButtonPress || event->type() == QEvent::MouseButtonRelease) { - event->accept(); - } - return rc; -} - void KCModuleQml::focusInEvent(QFocusEvent *event) { Q_UNUSED(event) @@ -287,7 +275,7 @@ void KCModuleQml::load() { d->configModule->load(); - emit defaulted(d->configModule->representsDefaults()); + Q_EMIT defaulted(d->configModule->representsDefaults()); } void KCModuleQml::save() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.78.0/src/kcmoduleqml_p.h new/kcmutils-5.79.0/src/kcmoduleqml_p.h --- old/kcmutils-5.78.0/src/kcmoduleqml_p.h 2021-01-02 14:07:55.000000000 +0100 +++ new/kcmutils-5.79.0/src/kcmoduleqml_p.h 2021-02-06 19:10:51.000000000 +0100 @@ -36,7 +36,6 @@ protected: void focusInEvent(QFocusEvent *event) override; QSize sizeHint() const override; - bool event(QEvent* event) override; bool eventFilter(QObject* watched, QEvent* event) override; private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.78.0/src/kcmultidialog.cpp new/kcmutils-5.79.0/src/kcmultidialog.cpp --- old/kcmutils-5.78.0/src/kcmultidialog.cpp 2021-01-02 14:07:55.000000000 +0100 +++ new/kcmutils-5.79.0/src/kcmultidialog.cpp 2021-02-06 19:10:51.000000000 +0100 @@ -370,10 +370,10 @@ // Send the configCommitted signal for every updated component. for (const QString &name : qAsConst(updatedComponents)) { - emit q->configCommitted(name.toLatin1()); + Q_EMIT q->configCommitted(name.toLatin1()); } - emit q->configCommitted(); + Q_EMIT q->configCommitted(); } void KCMultiDialog::slotApplyClicked() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.78.0/src/kpluginselector.cpp new/kcmutils-5.79.0/src/kpluginselector.cpp --- old/kcmutils-5.78.0/src/kpluginselector.cpp 2021-01-02 14:07:55.000000000 +0100 +++ new/kcmutils-5.79.0/src/kpluginselector.cpp 2021-02-06 19:10:51.000000000 +0100 @@ -275,7 +275,7 @@ connect(pluginDelegate, &Private::PluginDelegate::configCommitted, this, &KPluginSelector::configCommitted); connect(this, &KPluginSelector::defaultsIndicatorsVisible, pluginDelegate, &Private::PluginDelegate::slotResetModel); - connect(this, &KPluginSelector::changed, [this]{ emit defaulted(isDefault()); }); + connect(this, &KPluginSelector::changed, [this]{ Q_EMIT defaulted(isDefault()); }); layout->addWidget(d->lineEdit); layout->addWidget(d->listView); @@ -357,7 +357,7 @@ } static_cast<KPluginSelector::Private::PluginDelegate*>(d->listView->itemDelegate())->clearChangedEntries(); - emit changed(false); + Q_EMIT changed(false); } void KPluginSelector::save() @@ -371,7 +371,7 @@ } static_cast<KPluginSelector::Private::PluginDelegate*>(d->listView->itemDelegate())->clearChangedEntries(); - emit changed(false); + Q_EMIT changed(false); } bool KPluginSelector::isSaveNeeded() const @@ -403,7 +403,7 @@ } } - emit changed(isChanged); + Q_EMIT changed(isChanged); } bool KPluginSelector::isDefault() const @@ -470,7 +470,7 @@ { if (isVisible != d->showDefaultIndicator) { d->showDefaultIndicator = isVisible; - emit defaultsIndicatorsVisible(); + Q_EMIT defaultsIndicatorsVisible(); } } @@ -612,7 +612,7 @@ } if (ret) { - emit dataChanged(index, index); + Q_EMIT dataChanged(index, index); } return ret; @@ -880,7 +880,7 @@ } else { changedEntries.remove(pluginEntry); } - emit changed(!changedEntries.isEmpty()); + Q_EMIT changed(!changedEntries.isEmpty()); } void KPluginSelector::Private::PluginDelegate::slotAboutClicked() @@ -976,7 +976,7 @@ const QStringList parentComponents = moduleProxy->moduleInfo().property(QStringLiteral("X-KDE-ParentComponents")).toStringList(); moduleProxy->save(); for (const QString &parentComponent : parentComponents) { - emit configCommitted(parentComponent.toLatin1()); + Q_EMIT configCommitted(parentComponent.toLatin1()); } } } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.78.0/src/ksettings/dialog.cpp new/kcmutils-5.79.0/src/ksettings/dialog.cpp --- old/kcmutils-5.78.0/src/ksettings/dialog.cpp 2021-01-02 14:07:55.000000000 +0100 +++ new/kcmutils-5.79.0/src/ksettings/dialog.cpp 2021-02-06 19:10:51.000000000 +0100 @@ -456,7 +456,7 @@ pinfo.save(); } if (pluginStateDirty > 0) { - emit q->pluginSelectionChanged(); + Q_EMIT q->pluginSelectionChanged(); pluginStateDirty = 0; } Dispatcher::syncConfiguration();
