Hello community, here is the log from the commit of package kdeclarative for openSUSE:Factory checked in at 2018-02-16 21:29:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeclarative (Old) and /work/SRC/openSUSE:Factory/.kdeclarative.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdeclarative" Fri Feb 16 21:29:22 2018 rev:52 rq:576521 version:5.43.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdeclarative/kdeclarative.changes 2018-01-22 16:09:03.568484284 +0100 +++ /work/SRC/openSUSE:Factory/.kdeclarative.new/kdeclarative.changes 2018-02-16 21:29:23.360183520 +0100 @@ -1,0 +2,13 @@ +Mon Feb 12 23:42:08 CET 2018 - [email protected] + +- Update to 5.43.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.43.0.php +- Changes since 5.42.0: + * API dox: note @since & whattodo with deprecated KDeclarative::initialize() + * [ConfigModule] Re-use QML context and engine if any + * [ConfigPropertyMap] Add missing include + * [ConfigPropertyMap] Don't emit valueChanged on initial creation + +------------------------------------------------------------------- Old: ---- kdeclarative-5.42.0.tar.xz New: ---- kdeclarative-5.43.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeclarative.spec ++++++ --- /var/tmp/diff_new_pack.VZUlde/_old 2018-02-16 21:29:24.116156220 +0100 +++ /var/tmp/diff_new_pack.VZUlde/_new 2018-02-16 21:29:24.116156220 +0100 @@ -18,13 +18,13 @@ %bcond_without lang %define lname libKF5Declarative5 -%define _tar_path 5.42 +%define _tar_path 5.43 # 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: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kdeclarative -Version: 5.42.0 +Version: 5.43.0 Release: 0 %define kf5_version %{version} Summary: Integration of QML and KDE workspaces ++++++ kdeclarative-5.42.0.tar.xz -> kdeclarative-5.43.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.42.0/CMakeLists.txt new/kdeclarative-5.43.0/CMakeLists.txt --- old/kdeclarative-5.42.0/CMakeLists.txt 2018-01-07 17:16:58.000000000 +0100 +++ new/kdeclarative-5.43.0/CMakeLists.txt 2018-02-05 12:58:42.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.42.0") # handled by release scripts -set(KF5_DEP_VERSION "5.42.0") # handled by release scripts +set(KF5_VERSION "5.43.0") # handled by release scripts +set(KF5_DEP_VERSION "5.43.0") # handled by release scripts project(KDeclarative VERSION ${KF5_VERSION}) # Dependencies include(FeatureSummary) -find_package(ECM 5.42.0 NO_MODULE) +find_package(ECM 5.43.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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.42.0/po/id/kdeclarative5.po new/kdeclarative-5.43.0/po/id/kdeclarative5.po --- old/kdeclarative-5.42.0/po/id/kdeclarative5.po 2018-01-07 17:16:58.000000000 +0100 +++ new/kdeclarative-5.43.0/po/id/kdeclarative5.po 2018-02-05 12:58:42.000000000 +0100 @@ -2,42 +2,42 @@ # Copyright (C) 2010 This_file_is_part_of_KDE # This file is distributed under the same license as the kdelibs4 package. # Andhika Padmawan <[email protected]>, 2010-2014. -# Wantoyo <[email protected]>, 2017. +# Wantoyo <[email protected]>, 2017, 2018. # msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-30 03:07+0100\n" -"PO-Revision-Date: 2017-12-11 22:03+0700\n" +"PO-Revision-Date: 2018-01-26 18:53+0700\n" "Last-Translator: Wantoyo <[email protected]>\n" -"Language-Team: Indonesian <[email protected]>\n" +"Language-Team: Indonesian <[email protected]>\n" "Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Lokalize 2.0\n" #, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Andhika Padmawan" +msgstr "Andhika Padmawan,Wantoyo" #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "[email protected]" +msgstr "[email protected],[email protected]" #: kpackagelauncherqml/main.cpp:43 #, kde-format msgid "KPackage QML application shell" -msgstr "" +msgstr "Shell aplikasi KPackage QML" #: kpackagelauncherqml/main.cpp:50 -#, fuzzy, kde-format -#| msgid "defines the application font" +#, kde-format msgid "The unique name of the application (mandatory)" -msgstr "menjelaskan fonta aplikasi" +msgstr "Nama unik dari aplikasi (mandat)" #: qmlcontrols/kquickcontrols/KeySequenceItem.qml:38 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.42.0/po/nn/kdeclarative5.po new/kdeclarative-5.43.0/po/nn/kdeclarative5.po --- old/kdeclarative-5.42.0/po/nn/kdeclarative5.po 2018-01-07 17:16:58.000000000 +0100 +++ new/kdeclarative-5.43.0/po/nn/kdeclarative5.po 2018-02-05 12:58:42.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-06-30 03:05+0200\n" +"POT-Creation-Date: 2017-11-30 03:07+0100\n" "PO-Revision-Date: 2016-10-30 17:23+0100\n" "Last-Translator: Karl Ove Hufthammer <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" @@ -37,7 +37,7 @@ msgid "KPackage QML application shell" msgstr "Skal for KPackage-QML-program" -#: kpackagelauncherqml/main.cpp:51 +#: kpackagelauncherqml/main.cpp:50 #, kde-format msgid "The unique name of the application (mandatory)" msgstr "Eintydig namn på programmet (obligatorisk)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.42.0/po/zh_CN/kdeclarative5.po new/kdeclarative-5.43.0/po/zh_CN/kdeclarative5.po --- old/kdeclarative-5.42.0/po/zh_CN/kdeclarative5.po 2018-01-07 17:16:58.000000000 +0100 +++ new/kdeclarative-5.43.0/po/zh_CN/kdeclarative5.po 2018-02-05 12:58:42.000000000 +0100 @@ -15,7 +15,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-30 03:07+0100\n" -"PO-Revision-Date: 2018-01-05 06:38-0500\n" +"PO-Revision-Date: 2018-02-01 07:11-0500\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.42.0/src/kdeclarative/configpropertymap.cpp new/kdeclarative-5.43.0/src/kdeclarative/configpropertymap.cpp --- old/kdeclarative-5.42.0/src/kdeclarative/configpropertymap.cpp 2018-01-07 17:16:58.000000000 +0100 +++ new/kdeclarative-5.43.0/src/kdeclarative/configpropertymap.cpp 2018-02-05 12:58:42.000000000 +0100 @@ -24,6 +24,8 @@ #include <kcoreconfigskeleton.h> +#include <functional> + namespace KDeclarative { class ConfigPropertyMapPrivate { @@ -33,7 +35,12 @@ { } - void loadConfig(); + enum LoadConfigOption { + DontEmitValueChanged, + EmitValueChanged + }; + + void loadConfig(LoadConfigOption option); void writeConfig(); void writeConfigValue(const QString &key, const QVariant &value); @@ -48,12 +55,11 @@ d->config = config; //FIXME: find a prettier way to connect without lambdas - connect(config, &KCoreConfigSkeleton::configChanged, - [=](){d->loadConfig();}); - connect(this, &ConfigPropertyMap::valueChanged, - [=](const QString &key, const QVariant &value){d->writeConfigValue(key, value);}); + connect(config, &KCoreConfigSkeleton::configChanged, this, std::bind(&ConfigPropertyMapPrivate::loadConfig, d, ConfigPropertyMapPrivate::EmitValueChanged)); + connect(this, &ConfigPropertyMap::valueChanged, this, + [this](const QString &key, const QVariant &value){d->writeConfigValue(key, value);}); - d->loadConfig(); + d->loadConfig(ConfigPropertyMapPrivate::DontEmitValueChanged); } ConfigPropertyMap::~ConfigPropertyMap() @@ -81,15 +87,18 @@ return false; } -void ConfigPropertyMapPrivate::loadConfig() +void ConfigPropertyMapPrivate::loadConfig(ConfigPropertyMapPrivate::LoadConfigOption option) { if (!config) { return; } - foreach (KConfigSkeletonItem *item, config.data()->items()) { + const auto &items = config.data()->items(); + for (KConfigSkeletonItem *item : items) { q->insert(item->key(), item->property()); - emit q->valueChanged(item->key(), item->property()); + if (option == EmitValueChanged) { + emit q->valueChanged(item->key(), item->property()); + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.42.0/src/kdeclarative/configpropertymap.h new/kdeclarative-5.43.0/src/kdeclarative/configpropertymap.h --- old/kdeclarative-5.42.0/src/kdeclarative/configpropertymap.h 2018-01-07 17:16:58.000000000 +0100 +++ new/kdeclarative-5.43.0/src/kdeclarative/configpropertymap.h 2018-02-05 12:58:42.000000000 +0100 @@ -56,8 +56,6 @@ private: ConfigPropertyMapPrivate *const d; - Q_PRIVATE_SLOT(d, void loadConfig()) - Q_PRIVATE_SLOT(d, void writeConfigValue(const QString &key, const QVariant &value)) }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.42.0/src/kdeclarative/kdeclarative.h new/kdeclarative-5.43.0/src/kdeclarative/kdeclarative.h --- old/kdeclarative-5.42.0/src/kdeclarative/kdeclarative.h 2018-01-07 17:16:58.000000000 +0100 +++ new/kdeclarative-5.43.0/src/kdeclarative/kdeclarative.h 2018-02-05 12:58:42.000000000 +0100 @@ -45,7 +45,7 @@ #ifndef KDECLARATIVE_NO_DEPRECATE /** - * @deprecated + * @deprecated since 5.0. The method is a no-op now, any call can be simply removed. */ KDECLARATIVE_DEPRECATED void initialize(); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.42.0/src/quickaddons/configmodule.cpp new/kdeclarative-5.43.0/src/quickaddons/configmodule.cpp --- old/kdeclarative-5.42.0/src/quickaddons/configmodule.cpp 2018-01-07 17:16:58.000000000 +0100 +++ new/kdeclarative-5.43.0/src/quickaddons/configmodule.cpp 2018-02-05 12:58:42.000000000 +0100 @@ -36,6 +36,7 @@ #include <kaboutdata.h> #include <klocalizedstring.h> +#include <kdeclarative/qmlobject.h> #include <kdeclarative/qmlobjectsharedengine.h> #include <KPackage/Package> @@ -60,7 +61,7 @@ void authStatusChanged(int status); ConfigModule *_q; - KDeclarative::QmlObjectSharedEngine *_qmlObject; + KDeclarative::QmlObject *_qmlObject; ConfigModule::Buttons _buttons; const KAboutData *_about; QString _rootOnlyMessage; @@ -140,7 +141,20 @@ if (d->_qmlObject) { return qobject_cast<QQuickItem *>(d->_qmlObject->rootObject()); } - d->_qmlObject = new KDeclarative::QmlObjectSharedEngine(this); + + // if we have a qml context, hook up to it and use its engine + // this ensure that in e.g. Plasma config dialogs that use a different engine + // so they can have different QtQuick Controls styles, we don't end up using + // the shared engine that is used by the rest of plasma + + QQmlContext *ctx = QQmlEngine::contextForObject(this); + + if (ctx && ctx->engine()) { + d->_qmlObject = new KDeclarative::QmlObject(ctx->engine(), ctx, this); + } else { + d->_qmlObject = new KDeclarative::QmlObjectSharedEngine(this); + } + ConfigModulePrivate::s_rootObjects[d->_qmlObject->rootContext()] = this; d->_qmlObject->setTranslationDomain(aboutData()->componentName()); d->_qmlObject->setInitializationDelayed(true);
