diff -Nru kcmutils-5.52.0/CMakeLists.txt kcmutils-5.53.0/CMakeLists.txt
--- kcmutils-5.52.0/CMakeLists.txt 2018-11-03 17:58:27.000000000 +0000
+++ kcmutils-5.53.0/CMakeLists.txt 2018-12-01 14:52:51.000000000 +0000
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.0)
-set(KF5_VERSION "5.52.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.52.0") # handled by release scripts
+set(KF5_VERSION "5.53.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.53.0") # handled by release scripts
project(KCMUtils VERSION ${KF5_VERSION})
include(FeatureSummary)
-find_package(ECM 5.52.0 NO_MODULE)
+find_package(ECM 5.53.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)
@@ -16,7 +16,7 @@
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
-set(REQUIRED_QT_VERSION 5.8.0)
+set(REQUIRED_QT_VERSION 5.9.0)
find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Widgets DBus Qml Quick QuickWidgets)
set(KCMUtils_AUTOMOC_MACRO_NAMES "KCMODULECONTAINER")
diff -Nru kcmutils-5.52.0/debian/changelog kcmutils-5.53.0/debian/changelog
--- kcmutils-5.52.0/debian/changelog 2018-11-22 14:41:11.000000000 +0000
+++ kcmutils-5.53.0/debian/changelog 2018-12-09 20:47:37.000000000 +0000
@@ -1,3 +1,9 @@
+kcmutils (5.53.0-0ubuntu1) disco; urgency=medium
+
+ * New upstream release (5.53.0)
+
+ -- José Manuel Santamaría Lema Sun, 09 Dec 2018 20:47:37 +0000
+
kcmutils (5.52.0-0ubuntu1) disco; urgency=medium
[ Rik Mills ]
diff -Nru kcmutils-5.52.0/debian/control kcmutils-5.53.0/debian/control
--- kcmutils-5.52.0/debian/control 2018-11-22 14:41:11.000000000 +0000
+++ kcmutils-5.53.0/debian/control 2018-12-09 20:47:37.000000000 +0000
@@ -6,17 +6,17 @@
Build-Depends: cmake (>= 3.0~),
debhelper (>= 11~),
doxygen,
- extra-cmake-modules (>= 5.52.0~),
+ extra-cmake-modules (>= 5.53.0~),
graphviz,
- libkf5configwidgets-dev (>= 5.52.0~),
- libkf5coreaddons-dev (>= 5.52.0~),
- libkf5declarative-dev (>= 5.52.0~),
- libkf5i18n-dev (>= 5.52.0~),
- libkf5iconthemes-dev (>= 5.52.0~),
- libkf5itemviews-dev (>= 5.52.0~),
- libkf5package-dev (>= 5.52.0~),
- libkf5service-dev (>= 5.52.0~),
- libkf5xmlgui-dev (>= 5.52.0~),
+ libkf5configwidgets-dev (>= 5.53.0~),
+ libkf5coreaddons-dev (>= 5.53.0~),
+ libkf5declarative-dev (>= 5.53.0~),
+ libkf5i18n-dev (>= 5.53.0~),
+ libkf5iconthemes-dev (>= 5.53.0~),
+ libkf5itemviews-dev (>= 5.53.0~),
+ libkf5package-dev (>= 5.53.0~),
+ libkf5service-dev (>= 5.53.0~),
+ libkf5xmlgui-dev (>= 5.53.0~),
libqt5sql5-sqlite,
pkg-kde-tools (>= 0.15.15ubuntu1~),
qtbase5-dev (>= 5.8.0~),
@@ -42,12 +42,12 @@
Package: libkf5kcmutils-dev
Architecture: any
Section: libdevel
-Depends: libkf5configwidgets-dev (>= 5.52.0~),
- libkf5iconthemes-dev (>= 5.52.0~),
- libkf5itemviews-dev (>= 5.52.0~),
+Depends: libkf5configwidgets-dev (>= 5.53.0~),
+ libkf5iconthemes-dev (>= 5.53.0~),
+ libkf5itemviews-dev (>= 5.53.0~),
libkf5kcmutils5 (= ${binary:Version}),
- libkf5service-dev (>= 5.52.0~),
- libkf5xmlgui-dev (>= 5.52.0~),
+ libkf5service-dev (>= 5.53.0~),
+ libkf5xmlgui-dev (>= 5.53.0~),
${misc:Depends},
Recommends: libkf5kcmutils-doc (= ${source:Version})
Description: Extra APIs to write KConfig modules.
diff -Nru kcmutils-5.52.0/po/id/kcmutils5.po kcmutils-5.53.0/po/id/kcmutils5.po
--- kcmutils-5.52.0/po/id/kcmutils5.po 2018-11-03 17:58:27.000000000 +0000
+++ kcmutils-5.53.0/po/id/kcmutils5.po 2018-12-01 14:52:51.000000000 +0000
@@ -9,7 +9,7 @@
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2018-10-11 03:45+0200\n"
-"PO-Revision-Date: 2018-10-16 07:28+0700\n"
+"PO-Revision-Date: 2018-11-23 07:48+0700\n"
"Last-Translator: Wantoyo \n"
"Language-Team: Indonesian \n"
"Language: id\n"
@@ -46,7 +46,7 @@
#: kcmoduleloader.cpp:82
#, kde-format
msgid "The module %1 is disabled."
-msgstr "Modul %1 dinonaktifkan."
+msgstr "Modul %1 dinonfungsikan."
#: kcmoduleloader.cpp:83
#, kde-format
@@ -55,7 +55,7 @@
"or the module has been disabled by the administrator.
"
msgstr ""
"Baik perangkat keras/perangkat lunak yang modul sedang konfigurasi "
-"tidak tersedia atau modul telah dinonaktifkan oleh pengurus.
"
+"tidak tersedia atau modul telah dinonfungsikan oleh pengurus."
#: kcmoduleloader.cpp:139
#, kde-format
@@ -375,13 +375,13 @@
#: kdeglobals.kcfg:487
#, kde-format
msgid "Enable SOCKS support"
-msgstr "Aktifkan dukungan SOCKS"
+msgstr "Fungsikan dukungan SOCKS"
#. i18n: ectx: whatsthis, entry, group (Socks)
#: kdeglobals.kcfg:488
#, kde-format
msgid "Whether SOCKS version 4 and 5 should be enabled in KDE's sub systems"
-msgstr "Apakah SOCKS versi 4 dan 5 harus diaktifkan dalam sub sistem KDE"
+msgstr "Apakah SOCKS versi 4 dan 5 harus difungsikan dalam sub sistem KDE"
#. i18n: ectx: label, entry, group (Socks)
#: kdeglobals.kcfg:492
@@ -503,4 +503,4 @@
#: ksettings/dialog.cpp:230
#, kde-format
msgid "Enable component"
-msgstr "Aktifkan komponen"
+msgstr "Fungsikan komponen"
diff -Nru kcmutils-5.52.0/po/pa/kcmutils5.po kcmutils-5.53.0/po/pa/kcmutils5.po
--- kcmutils-5.52.0/po/pa/kcmutils5.po 2018-11-03 17:58:27.000000000 +0000
+++ kcmutils-5.53.0/po/pa/kcmutils5.po 2018-12-01 14:52:51.000000000 +0000
@@ -4,7 +4,7 @@
#
# Amanpreet Singh Alam , 2004.
# Amanpreet Singh Alam , 2004.
-# A S Alam , 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
+# A S Alam , 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2018.
# ASB , 2007.
# Amanpreet Singh Alam , 2008.
# Amanpreet Singh , 2008.
@@ -14,27 +14,25 @@
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2018-10-11 03:45+0200\n"
-"PO-Revision-Date: 2014-03-16 23:21-0500\n"
-"Last-Translator: A S Alam \n"
-"Language-Team: Punjabi/Panjabi \n"
+"PO-Revision-Date: 2018-11-08 23:01-0800\n"
+"Last-Translator: A S Alam \n"
+"Language-Team: Punjabi \n"
"Language: pa\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#, kde-format
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
-msgstr ""
-"ਅ.ਸ.ਆਲਮ. ੨੦੦੪-੨੦੧੪\n"
-"http://code.google.com/p/gurmukhi/"
+msgstr "ਅ.ਸ.ਆਲਮ. ੨੦੦੪-੨੦੧੮"
#, kde-format
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
-msgstr "aalam@users.sf.net"
+msgstr "alam.yellow@gmail.com"
#: kcmoduleloader.cpp:79
#, kde-format
@@ -51,7 +49,7 @@
#: kcmoduleloader.cpp:82
#, kde-format
msgid "The module %1 is disabled."
-msgstr "ਮੋਡੀਊਲ %1 ਆਯੋਗ ਹੈ।"
+msgstr "ਮੋਡੀਊਲ %1 ਅਸਮਰੱਥ ਹੈ।"
#: kcmoduleloader.cpp:83
#, kde-format
@@ -470,10 +468,9 @@
msgstr "ਪਲੱਗਇਨ ਖੋਜ"
#: kpluginselector.cpp:710
-#, fuzzy, kde-format
-#| msgid "&About"
+#, kde-format
msgid "About"
-msgstr "ਇਸ ਬਾਰੇ(&A)"
+msgstr "ਇਸ ਬਾਰੇ"
#: kpluginselector.cpp:813
#, kde-format
diff -Nru kcmutils-5.52.0/po/zh_CN/kcmutils5.po kcmutils-5.53.0/po/zh_CN/kcmutils5.po
--- kcmutils-5.52.0/po/zh_CN/kcmutils5.po 2018-11-03 17:58:27.000000000 +0000
+++ kcmutils-5.53.0/po/zh_CN/kcmutils5.po 2018-12-01 14:52:51.000000000 +0000
@@ -15,7 +15,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2018-10-11 03:45+0200\n"
-"PO-Revision-Date: 2018-10-09 18:38\n"
+"PO-Revision-Date: 2018-11-12 09:13\n"
"Last-Translator: guoyunhe \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
diff -Nru kcmutils-5.52.0/src/kcmoduleqml.cpp kcmutils-5.53.0/src/kcmoduleqml.cpp
--- kcmutils-5.52.0/src/kcmoduleqml.cpp 2018-11-03 17:58:27.000000000 +0000
+++ kcmutils-5.53.0/src/kcmoduleqml.cpp 2018-12-01 14:52:51.000000000 +0000
@@ -71,35 +71,35 @@
//HACK:Here is important those two enums keep having the exact same values
//but the kdeclarative one can't use the KCModule's enum
setButtons((KCModule::Buttons)(int)d->configModule->buttons());
- connect(configModule, &KQuickAddons::ConfigModule::buttonsChanged, [=] {
+ connect(configModule, &KQuickAddons::ConfigModule::buttonsChanged, this, [=] {
setButtons((KCModule::Buttons)(int)d->configModule->buttons());
});
if (d->configModule->needsSave()) {
emit changed(true);
}
- connect(configModule, &KQuickAddons::ConfigModule::needsSaveChanged, [=] {
+ connect(configModule, &KQuickAddons::ConfigModule::needsSaveChanged, this, [=] {
emit changed(d->configModule->needsSave());
});
setNeedsAuthorization(d->configModule->needsAuthorization());
- connect(configModule, &KQuickAddons::ConfigModule::needsAuthorizationChanged, [=] {
+ connect(configModule, &KQuickAddons::ConfigModule::needsAuthorizationChanged, this, [=] {
setNeedsAuthorization(d->configModule->needsAuthorization());
});
setRootOnlyMessage(d->configModule->rootOnlyMessage());
setUseRootOnlyMessage(d->configModule->useRootOnlyMessage());
- connect(configModule, &KQuickAddons::ConfigModule::rootOnlyMessageChanged, [=] {
+ connect(configModule, &KQuickAddons::ConfigModule::rootOnlyMessageChanged, this, [=] {
setRootOnlyMessage(d->configModule->rootOnlyMessage());
});
- connect(configModule, &KQuickAddons::ConfigModule::useRootOnlyMessageChanged, [=] {
+ connect(configModule, &KQuickAddons::ConfigModule::useRootOnlyMessageChanged, this, [=] {
setUseRootOnlyMessage(d->configModule->useRootOnlyMessage());
});
if (!d->configModule->authActionName().isEmpty()) {
setAuthAction(KAuth::Action(d->configModule->authActionName()));
}
- connect(configModule, &KQuickAddons::ConfigModule::authActionNameChanged, [=] {
+ connect(configModule, &KQuickAddons::ConfigModule::authActionNameChanged, this, [=] {
setAuthAction(d->configModule->authActionName());
});
setAboutData(d->configModule->aboutData());
@@ -132,14 +132,14 @@
component->setData(QByteArrayLiteral("import QtQuick 2.3\n"
"import org.kde.kirigami 2.4 as Kirigami\n"
"Kirigami.ApplicationItem{"
- //purely cosmetic space
- "header: Item {height: Kirigami.Units.largeSpacing}"
+ //purely cosmetic space, those magic values are to align perfectly within Systemsettings
+ "header: Item {height: Math.round(Kirigami.Units.gridUnit*0.25)}"
// allow only one column by default
"pageStack.defaultColumnWidth:width;"
"pageStack.separatorVisible:false;"
"pageStack.globalToolBar.style: pageStack.wideScreen ? Kirigami.ApplicationHeaderStyle.Titles : Kirigami.ApplicationHeaderStyle.Breadcrumb;"
"pageStack.globalToolBar.showNavigationButtons:false;"
- "pageStack.globalToolBar.preferredHeight:Kirigami.Units.gridUnit*1.6;"
+ "pageStack.globalToolBar.preferredHeight:Kirigami.Units.gridUnit*2;"
"pageStack.globalToolBar.separatorVisible:false;"
"activeFocusOnTab:true;"
"Keys.onReturnPressed:{event.accepted=true}"
diff -Nru kcmutils-5.52.0/src/kpluginselector.cpp kcmutils-5.53.0/src/kpluginselector.cpp
--- kcmutils-5.52.0/src/kpluginselector.cpp 2018-11-03 17:58:27.000000000 +0000
+++ kcmutils-5.53.0/src/kpluginselector.cpp 2018-12-01 14:52:51.000000000 +0000
@@ -70,7 +70,7 @@
if (added) {
QStringList dependencyList = pluginEntry->pluginInfo.dependencies();
- if (!dependencyList.count()) {
+ if (dependencyList.isEmpty()) {
return;
}
@@ -222,7 +222,7 @@
void KPluginSelector::Private::DependenciesWidget::updateDetails()
{
- if (!dependencyMap.count()) {
+ if (dependencyMap.isEmpty()) {
setVisible(false);
return;
}
@@ -477,7 +477,7 @@
}
}
- if (listToAdd.count()) {
+ if (!listToAdd.isEmpty()) {
beginInsertRows(QModelIndex(), pluginEntryList.count(), pluginEntryList.count() + listToAdd.count() - 1);
pluginEntryList << listToAdd;
endInsertRows();
@@ -874,7 +874,7 @@
}
// it could happen that we had services to show, but none of them were real modules.
- if (moduleProxyList.count()) {
+ if (!moduleProxyList.isEmpty()) {
QVBoxLayout *layout = new QVBoxLayout;
layout->addWidget(mainWidget);
const int marginHint = configDialog.style()->pixelMetric(QStyle::PM_DefaultChildMargin);
diff -Nru kcmutils-5.52.0/src/ksettings/dialog.cpp kcmutils-5.53.0/src/ksettings/dialog.cpp
--- kcmutils-5.52.0/src/ksettings/dialog.cpp 2018-11-03 17:58:27.000000000 +0000
+++ kcmutils-5.53.0/src/ksettings/dialog.cpp 2018-12-01 14:52:51.000000000 +0000
@@ -339,7 +339,7 @@
bool foundPlugin = false;
foreach (const KPluginInfo &pinfo, plugininfos) {
if (pinfo.service() == info.service()) {
- if (!pinfo.kcmServices().count()) {
+ if (pinfo.kcmServices().isEmpty()) {
const KService::Ptr service = info.service();
// FIXME get weight from service or plugin info
const int weight = 1000;