Hello community, here is the log from the commit of package kdeclarative for openSUSE:Factory checked in at 2016-09-14 23:20:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeclarative (Old) and /work/SRC/openSUSE:Factory/.kdeclarative.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdeclarative" Changes: -------- --- /work/SRC/openSUSE:Factory/kdeclarative/kdeclarative.changes 2016-08-29 15:00:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdeclarative.new/kdeclarative.changes 2016-09-14 23:20:34.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Sep 6 20:48:16 UTC 2016 - [email protected] + +- Update to 5.26.0 + * [kpackagelauncherqml] Assume desktop file name is same as pluginId + * Load QtQuick rendering settings from a config file and set default + * icondialog.cpp - proper compile fix that doesn't shadow m_dialog + * Fix crash when no QApplication is available + * Expose translation domain + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.26.0.php + +------------------------------------------------------------------- Old: ---- kdeclarative-5.25.0.tar.xz New: ---- kdeclarative-5.26.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeclarative.spec ++++++ --- /var/tmp/diff_new_pack.Fsk5lJ/_old 2016-09-14 23:20:35.000000000 +0200 +++ /var/tmp/diff_new_pack.Fsk5lJ/_new 2016-09-14 23:20:35.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5Declarative5 -%define _tar_path 5.25 +%define _tar_path 5.26 Name: kdeclarative -Version: 5.25.0 +Version: 5.26.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 ++++++ kdeclarative-5.25.0.tar.xz -> kdeclarative-5.26.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.25.0/CMakeLists.txt new/kdeclarative-5.26.0/CMakeLists.txt --- old/kdeclarative-5.25.0/CMakeLists.txt 2016-08-07 15:44:43.000000000 +0200 +++ new/kdeclarative-5.26.0/CMakeLists.txt 2016-09-06 13:59:05.000000000 +0200 @@ -4,15 +4,15 @@ # Dependencies include(FeatureSummary) -find_package(ECM 5.25.0 NO_MODULE) +find_package(ECM 5.26.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) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) set(REQUIRED_QT_VERSION 5.5.0) -set(KF5_VERSION "5.25.0") # handled by release scripts -set(KF5_DEP_VERSION "5.25.0") # handled by release scripts +set(KF5_VERSION "5.26.0") # handled by release scripts +set(KF5_DEP_VERSION "5.26.0") # handled by release scripts find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Qml Quick Gui) include(KDEInstallDirs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.25.0/po/pl/kdeclarative5.po new/kdeclarative-5.26.0/po/pl/kdeclarative5.po --- old/kdeclarative-5.25.0/po/pl/kdeclarative5.po 2016-08-07 15:44:43.000000000 +0200 +++ new/kdeclarative-5.26.0/po/pl/kdeclarative5.po 2016-09-06 13:59:05.000000000 +0200 @@ -11,13 +11,13 @@ # Marta Rybczyńska <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013. # Michal Rudolf <[email protected]>, 2010. # Artur Chłond <[email protected]>, 2010. -# Łukasz Wojniłowicz <[email protected]>, 2011, 2012, 2013, 2014, 2015. +# Łukasz Wojniłowicz <[email protected]>, 2011, 2012, 2013, 2014, 2015, 2016. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-05-08 07:20+0000\n" -"PO-Revision-Date: 2015-03-07 07:15+0100\n" +"PO-Revision-Date: 2016-08-20 08:31+0100\n" "Last-Translator: Łukasz Wojniłowicz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" "Language: pl\n" @@ -108,7 +108,7 @@ ">\n" ">\n" ">\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -149,7 +149,7 @@ msgstr "" "Skrót F12 jest zarezerwowany w Windows, więc nie można go użyć jako skrótu " "globalnego.\n" -"Proszę wybrać inny." +"Wybierz inny." #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:333 msgid "Conflict with Standard Application Shortcut" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.25.0/src/kpackagelauncherqml/main.cpp new/kdeclarative-5.26.0/src/kpackagelauncherqml/main.cpp --- old/kdeclarative-5.25.0/src/kpackagelauncherqml/main.cpp 2016-08-07 15:44:43.000000000 +0200 +++ new/kdeclarative-5.26.0/src/kpackagelauncherqml/main.cpp 2016-09-06 13:59:05.000000000 +0200 @@ -92,6 +92,9 @@ for (auto author : data.authors()) { aboutData.addAuthor(author.name(), author.task(), author.emailAddress(), author.webAddress(), author.ocsUsername()); } + // We assume that desktop file in applicaitons dir is named similar as + // the pluginId, this is required to get icons working on wayland for example + aboutData.setDesktopFileName(data.pluginId()); KAboutData::setApplicationData(aboutData); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.25.0/src/qmlcontrols/kquickcontrolsaddons/icondialog.cpp new/kdeclarative-5.26.0/src/qmlcontrols/kquickcontrolsaddons/icondialog.cpp --- old/kdeclarative-5.25.0/src/qmlcontrols/kquickcontrolsaddons/icondialog.cpp 2016-08-07 15:44:43.000000000 +0200 +++ new/kdeclarative-5.26.0/src/qmlcontrols/kquickcontrolsaddons/icondialog.cpp 2016-09-06 13:59:05.000000000 +0200 @@ -22,30 +22,36 @@ #include <QQuickItem> #include <QQuickWindow> +#include <QApplication> #include <KIconDialog> #include <KIconLoader> IconDialog::IconDialog(QObject *parent) : QObject(parent) - , m_dialog(new KIconDialog()) + , m_dialog(Q_NULLPTR) , m_iconSize(0) , m_user(false) , m_modality(Qt::WindowModal) , m_visible(false) { - connect(m_dialog.data(), &KIconDialog::newIconName, this, [this](const QString &newIconName) { - if (m_iconName != newIconName) { - m_iconName = newIconName; - emit iconNameChanged(newIconName); - } - }); + if (qobject_cast<QApplication *>(QCoreApplication::instance())) { + m_dialog.reset(new KIconDialog()); + connect(m_dialog.data(), &KIconDialog::newIconName, this, [this](const QString &newIconName) { + if (m_iconName != newIconName) { + m_iconName = newIconName; + emit iconNameChanged(newIconName); + } + }); - m_dialog->installEventFilter(this); + m_dialog->installEventFilter(this); + } } IconDialog::~IconDialog() { - m_dialog->close(); + if (m_dialog) { + m_dialog->close(); + } } QString IconDialog::iconName() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.25.0/src/quickaddons/CMakeLists.txt new/kdeclarative-5.26.0/src/quickaddons/CMakeLists.txt --- old/kdeclarative-5.25.0/src/quickaddons/CMakeLists.txt 2016-08-07 15:44:43.000000000 +0200 +++ new/kdeclarative-5.26.0/src/quickaddons/CMakeLists.txt 2016-09-06 13:59:05.000000000 +0200 @@ -1,8 +1,13 @@ -add_library(KF5QuickAddons +set(KF5QuickAddons_LIB_SRCS imagetexturescache.cpp managedtexturenode.cpp quickviewsharedengine.cpp - configmodule.cpp) + configmodule.cpp + qtquicksettings.cpp) +kconfig_add_kcfg_files(KF5QuickAddons_LIB_SRCS renderersettings.kcfgc) + +add_library(KF5QuickAddons ${KF5QuickAddons_LIB_SRCS}) + generate_export_header(KF5QuickAddons EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/quickaddons_export.h BASE_NAME QuickAddons) add_library(KF5::QuickAddons ALIAS KF5QuickAddons) @@ -15,6 +20,7 @@ PRIVATE KF5::I18n KF5::Declarative + KF5::ConfigGui ) set_target_properties(KF5QuickAddons @@ -29,7 +35,6 @@ HEADER_NAMES ImageTexturesCache ManagedTextureNode - PREFIX QuickAddons REQUIRED_HEADERS QuickAddons_HEADERS ) @@ -40,6 +45,7 @@ HEADER_NAMES ImageTexturesCache ManagedTextureNode + QtQuickSettings ConfigModule QuickViewSharedEngine diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.25.0/src/quickaddons/qtquicksettings.cpp new/kdeclarative-5.26.0/src/quickaddons/qtquicksettings.cpp --- old/kdeclarative-5.25.0/src/quickaddons/qtquicksettings.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeclarative-5.26.0/src/quickaddons/qtquicksettings.cpp 2016-09-06 13:59:05.000000000 +0200 @@ -0,0 +1,43 @@ +/* + * Copyright 2016 David Edmundson <[email protected]> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library General Public License as + * published by the Free Software Foundation; either version 2 or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "qtquicksettings.h" +#include "renderersettings.h" + +#include <QSurfaceFormat> + +void KQuickAddons::QtQuickSettings::init() +{ + PlasmaQtQuickSettings::RendererSettings s; + if (!s.renderLoop().isNull()) { + qputenv("QSG_RENDER_LOOP", s.renderLoop().toLatin1()); + } + + if (!s.sceneGraphBackend().isNull()) { + qputenv("QMLSCENE_DEVICE", s.sceneGraphBackend().toLatin1()); + //TODO Qt5.8 - QQuickWindow::setSceneGraphBackend(..) + } + if (s.forceGlCoreProfile()) { + QSurfaceFormat format; + format.setVersion(3,2); + format.setProfile(QSurfaceFormat::CoreProfile); + QSurfaceFormat::setDefaultFormat(format); + } +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.25.0/src/quickaddons/qtquicksettings.h new/kdeclarative-5.26.0/src/quickaddons/qtquicksettings.h --- old/kdeclarative-5.25.0/src/quickaddons/qtquicksettings.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeclarative-5.26.0/src/quickaddons/qtquicksettings.h 2016-09-06 13:59:05.000000000 +0200 @@ -0,0 +1,42 @@ +/* + * Copyright 2016 David Edmundson <[email protected]> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library General Public License as + * published by the Free Software Foundation; either version 2 or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef PLASMAQTQUICKSETTINGS_H +#define PLASMAQTQUICKSETTINGS_H + +#include "quickaddons_export.h" + +namespace KQuickAddons +{ + namespace QtQuickSettings + { + /* + * Load settings from the appConfig (app + kdeglobals) which relate to QtQuick rendering. + * This will then set relevant default QWindow and QSurfaceFormat flags, or in some cases environment variables + * + * This function must be called at the start of your application before any windows are created. + * + * @since 5.26 + */ + QUICKADDONS_EXPORT void init(); + + } +} + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.25.0/src/quickaddons/quickviewsharedengine.cpp new/kdeclarative-5.26.0/src/quickaddons/quickviewsharedengine.cpp --- old/kdeclarative-5.25.0/src/quickaddons/quickviewsharedengine.cpp 2016-08-07 15:44:43.000000000 +0200 +++ new/kdeclarative-5.26.0/src/quickaddons/quickviewsharedengine.cpp 2016-09-06 13:59:05.000000000 +0200 @@ -156,6 +156,16 @@ } +void QuickViewSharedEngine::setTranslationDomain(const QString &translationDomain) +{ + d->qmlObject->setTranslationDomain(translationDomain); +} + +QString QuickViewSharedEngine::translationDomain() const +{ + return d->qmlObject->translationDomain(); +} + QQmlEngine *QuickViewSharedEngine::engine() const { return d->qmlObject->engine(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.25.0/src/quickaddons/quickviewsharedengine.h new/kdeclarative-5.26.0/src/quickaddons/quickviewsharedengine.h --- old/kdeclarative-5.25.0/src/quickaddons/quickviewsharedengine.h 2016-08-07 15:44:43.000000000 +0200 +++ new/kdeclarative-5.26.0/src/quickaddons/quickviewsharedengine.h 2016-09-06 13:59:05.000000000 +0200 @@ -56,6 +56,29 @@ explicit QuickViewSharedEngine(QWindow *parent = 0); ~QuickViewSharedEngine(); + /** + * Installs a translation domain for all + * i18n global functions. If a translation domain is set all i18n calls delegate to the + * matching i18nd calls with the provided translation domain. + * + * The translationDomain affects all i18n calls including those from imports. Because of + * that modules intended to be used as imports should prefer the i18nd variants and set + * the translation domain explicitly in each call. + * + * This method is only required if your declarative usage is inside a library. If it's + * in an application there is no need to set the translation domain as the application's + * domain can be used. + * + * @param translationDomain The translation domain to be used for i18n calls. + * @since 5.25 + */ + void setTranslationDomain(const QString &translationDomain); + + /** + * @return the translation domain for the i18n calls done in this QML engine + * @since 5.25 + */ + QString translationDomain() const; QQmlEngine *engine() const; QList<QQmlError> errors() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.25.0/src/quickaddons/renderer.kcfg new/kdeclarative-5.26.0/src/quickaddons/renderer.kcfg --- old/kdeclarative-5.25.0/src/quickaddons/renderer.kcfg 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeclarative-5.26.0/src/quickaddons/renderer.kcfg 2016-09-06 13:59:05.000000000 +0200 @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 + http://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > + <kcfgfile arg="true" /> + <group name="QtQuickRendererSettings"> + <entry name="RenderLoop" type="String"> + <default></default> + </entry> + <entry name="SceneGraphBackend" type="String"> + <default>false</default> + </entry> + <entry name="ForceGlCoreProfile" type="Bool"> + <default>false</default> + </entry> + </group> +</kcfg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.25.0/src/quickaddons/renderersettings.kcfgc new/kdeclarative-5.26.0/src/quickaddons/renderersettings.kcfgc --- old/kdeclarative-5.25.0/src/quickaddons/renderersettings.kcfgc 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeclarative-5.26.0/src/quickaddons/renderersettings.kcfgc 2016-09-06 13:59:05.000000000 +0200 @@ -0,0 +1,4 @@ +File=renderer.kcfg +NameSpace=PlasmaQtQuickSettings +ClassName=RendererSettings +UseEnumTypes=true
