Hello community,
here is the log from the commit of package kcmutils for openSUSE:Factory checked in at 2016-07-03 12:19:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kcmutils (Old)
and /work/SRC/openSUSE:Factory/.kcmutils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcmutils"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kcmutils/kcmutils.changes 2016-05-19 12:06:24.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kcmutils.new/kcmutils.changes 2016-07-03 12:20:25.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Jun 6 21:23:41 UTC 2016 - hrvoje.senjan@gmail.com
+
+- Update to 5.23.0
+ * Use QQuickWidget for QML KCMs (kde#359124)
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.23.0.php
+
+-------------------------------------------------------------------
Old:
----
kcmutils-5.22.0.tar.xz
New:
----
kcmutils-5.23.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kcmutils.spec ++++++
--- /var/tmp/diff_new_pack.PqHOyW/_old 2016-07-03 12:20:26.000000000 +0200
+++ /var/tmp/diff_new_pack.PqHOyW/_new 2016-07-03 12:20:26.000000000 +0200
@@ -18,9 +18,9 @@
%bcond_without lang
%define lname libKF5KCMUtils5
-%define _tar_path 5.22
+%define _tar_path 5.23
Name: kcmutils
-Version: 5.22.0
+Version: 5.23.0
Release: 0
%define kf5_version %{version}
BuildRequires: cmake >= 2.8.12
@@ -39,6 +39,7 @@
BuildRequires: cmake(Qt5DBus) >= 5.4.0
BuildRequires: cmake(Qt5Qml) >= 5.4.0
BuildRequires: cmake(Qt5Quick) >= 5.4.0
+BuildRequires: cmake(Qt5QuickWidgets) >= 5.4.0
BuildRequires: cmake(Qt5Widgets) >= 5.4.0
Summary: Provides various classes to work with KCModules
License: LGPL-2.1+
++++++ kcmutils-5.22.0.tar.xz -> kcmutils-5.23.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.22.0/CMakeLists.txt new/kcmutils-5.23.0/CMakeLists.txt
--- old/kcmutils-5.22.0/CMakeLists.txt 2016-05-07 17:06:07.000000000 +0200
+++ new/kcmutils-5.23.0/CMakeLists.txt 2016-06-06 13:27:12.000000000 +0200
@@ -3,7 +3,7 @@
project(KCMUtils)
include(FeatureSummary)
-find_package(ECM 5.22.0 NO_MODULE)
+find_package(ECM 5.23.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)
@@ -15,7 +15,7 @@
include(KDECMakeSettings)
set(REQUIRED_QT_VERSION 5.4.0)
-find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Widgets DBus Qml Quick)
+find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Widgets DBus Qml Quick QuickWidgets)
include(GenerateExportHeader)
@@ -23,8 +23,8 @@
include(ECMGenerateHeaders)
include(ECMPackageConfigHelpers)
-set(KF5_VERSION "5.22.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.22.0") # handled by release scripts
+set(KF5_VERSION "5.23.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.23.0") # handled by release scripts
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KCMUTILS
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kcmutils_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5KCMUtilsConfigVersion.cmake"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.22.0/metainfo.yaml new/kcmutils-5.23.0/metainfo.yaml
--- old/kcmutils-5.22.0/metainfo.yaml 2016-05-07 17:06:07.000000000 +0200
+++ new/kcmutils-5.23.0/metainfo.yaml 2016-06-06 13:27:12.000000000 +0200
@@ -10,3 +10,7 @@
- qmake: KCMUtils
cmake: "KF5::KCMUtils"
cmakename: KF5KCMUtils
+
+public_lib: true
+group: Frameworks
+subgroup: Tier 3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.22.0/po/ca/kcmutils5.po new/kcmutils-5.23.0/po/ca/kcmutils5.po
--- old/kcmutils-5.22.0/po/ca/kcmutils5.po 2016-05-07 17:06:07.000000000 +0200
+++ new/kcmutils-5.23.0/po/ca/kcmutils5.po 2016-06-06 13:27:12.000000000 +0200
@@ -1,12 +1,12 @@
# Translation of kcmutils5.po to Catalan
-# Copyright (C) 2014-2015 This_file_is_part_of_KDE
+# Copyright (C) 2014-2016 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.
#
# Sebastià Pla i Sanz , 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007.
# Antoni Bella Pérez , 2003, 2006, 2011, 2012, 2013, 2014.
# Albert Astals Cid , 2004, 2005, 2007.
-# Josep Ma. Ferrer , 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015.
+# Josep Ma. Ferrer , 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016.
# Robert Millan , 2009.
# Orestes Mas , 2010.
msgid ""
@@ -14,7 +14,7 @@
"Project-Id-Version: kcmutils5\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2016-01-28 07:40+0000\n"
-"PO-Revision-Date: 2015-06-13 18:03+0200\n"
+"PO-Revision-Date: 2016-05-19 22:46+0200\n"
"Last-Translator: Josep Ma. Ferrer \n"
"Language-Team: Catalan \n"
"Language: ca\n"
@@ -50,7 +50,7 @@
#: kcmoduleloader.cpp:82
#, kde-format
msgid "The module %1 is disabled."
-msgstr "El mòdul %1 s'ha deshabilitat."
+msgstr "El mòdul %1 s'ha desactivat."
#: kcmoduleloader.cpp:83
msgid ""
@@ -58,7 +58,7 @@
"or the module has been disabled by the administrator.</p></qt>"
msgstr ""
"<qt><p>Aquest mòdul configura un maquinari o un programari que ara no estan "
-"disponibles, o l'administrador ha deshabilitat el mòdul.</p></qt>"
+"disponibles, o l'administrador ha desactivat el mòdul.</p></qt>"
#: kcmoduleloader.cpp:140
#, kde-format
@@ -336,12 +336,12 @@
#. i18n: ectx: label, entry, group (Socks)
#: kdeglobals.kcfg:487
msgid "Enable SOCKS support"
-msgstr "Habilita el funcionament amb SOCKS"
+msgstr "Activa el funcionament amb SOCKS"
#. i18n: ectx: whatsthis, entry, group (Socks)
#: kdeglobals.kcfg:488
msgid "Whether SOCKS version 4 and 5 should be enabled in KDE's sub systems"
-msgstr "Si s'ha d'habilitar el SOCKS versió 4 i 5 en el subsistema del KDE"
+msgstr "Si s'ha d'activar el SOCKS versió 4 i 5 en el subsistema del KDE"
#. i18n: ectx: label, entry, group (Socks)
#: kdeglobals.kcfg:492
@@ -456,4 +456,4 @@
#: ksettings/dialog.cpp:231
msgid "Enable component"
-msgstr "Habilita el component"
+msgstr "Activa el component"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.22.0/po/ca@valencia/kcmutils5.po new/kcmutils-5.23.0/po/ca@valencia/kcmutils5.po
--- old/kcmutils-5.22.0/po/ca@valencia/kcmutils5.po 2016-05-07 17:06:07.000000000 +0200
+++ new/kcmutils-5.23.0/po/ca@valencia/kcmutils5.po 2016-06-06 13:27:12.000000000 +0200
@@ -1,12 +1,12 @@
# Translation of kcmutils5.po to Catalan (Valencian)
-# Copyright (C) 2014-2015 This_file_is_part_of_KDE
+# Copyright (C) 2014-2016 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.
#
# Sebastià Pla i Sanz , 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007.
# Antoni Bella Pérez , 2003, 2006, 2011, 2012, 2013, 2014.
# Albert Astals Cid , 2004, 2005, 2007.
-# Josep Ma. Ferrer , 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015.
+# Josep Ma. Ferrer , 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016.
# Robert Millan , 2009.
# Orestes Mas , 2010.
msgid ""
@@ -14,7 +14,7 @@
"Project-Id-Version: kcmutils5\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2016-01-28 07:40+0000\n"
-"PO-Revision-Date: 2015-06-13 18:03+0200\n"
+"PO-Revision-Date: 2016-05-19 22:46+0200\n"
"Last-Translator: Josep Ma. Ferrer \n"
"Language-Team: Catalan \n"
"Language: ca@valencia\n"
@@ -50,7 +50,7 @@
#: kcmoduleloader.cpp:82
#, kde-format
msgid "The module %1 is disabled."
-msgstr "El mòdul %1 s'ha deshabilitat."
+msgstr "El mòdul %1 s'ha desactivat."
#: kcmoduleloader.cpp:83
msgid ""
@@ -58,7 +58,7 @@
"or the module has been disabled by the administrator.</p></qt>"
msgstr ""
"<qt><p>Este mòdul configura un maquinari o un programari que ara no estan "
-"disponibles, o l'administrador ha deshabilitat el mòdul.</p></qt>"
+"disponibles, o l'administrador ha desactivat el mòdul.</p></qt>"
#: kcmoduleloader.cpp:140
#, kde-format
@@ -336,12 +336,12 @@
#. i18n: ectx: label, entry, group (Socks)
#: kdeglobals.kcfg:487
msgid "Enable SOCKS support"
-msgstr "Habilita el funcionament amb SOCKS"
+msgstr "Activa el funcionament amb SOCKS"
#. i18n: ectx: whatsthis, entry, group (Socks)
#: kdeglobals.kcfg:488
msgid "Whether SOCKS version 4 and 5 should be enabled in KDE's sub systems"
-msgstr "Si s'ha d'habilitar el SOCKS versió 4 i 5 en el subsistema del KDE"
+msgstr "Si s'ha d'activar el SOCKS versió 4 i 5 en el subsistema del KDE"
#. i18n: ectx: label, entry, group (Socks)
#: kdeglobals.kcfg:492
@@ -456,4 +456,4 @@
#: ksettings/dialog.cpp:231
msgid "Enable component"
-msgstr "Habilita el component"
+msgstr "Activa el component"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.22.0/src/CMakeLists.txt new/kcmutils-5.23.0/src/CMakeLists.txt
--- old/kcmutils-5.22.0/src/CMakeLists.txt 2016-05-07 17:06:07.000000000 +0200
+++ new/kcmutils-5.23.0/src/CMakeLists.txt 2016-06-06 13:27:12.000000000 +0200
@@ -28,6 +28,7 @@
Qt5::DBus # dbus usage in kcmoduleproxy.cpp
Qt5::Qml
Qt5::Quick
+ Qt5::QuickWidgets
KF5::CoreAddons
KF5::I18n
KF5::IconThemes # KIconLoader
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.22.0/src/kcmoduleqml.cpp new/kcmutils-5.23.0/src/kcmoduleqml.cpp
--- old/kcmutils-5.22.0/src/kcmoduleqml.cpp 2016-05-07 17:06:07.000000000 +0200
+++ new/kcmutils-5.23.0/src/kcmoduleqml.cpp 2016-06-06 13:27:12.000000000 +0200
@@ -27,6 +27,7 @@
#include <QQuickWindow>
#include <QQuickItem>
#include <QGuiApplication>
+#include <QQuickWidget>
#include
#include
@@ -106,17 +107,23 @@
QVBoxLayout* layout = new QVBoxLayout(this);
- d->quickWindow = new QQuickWindow();
+ QQuickWidget *widget = new QQuickWidget(d->configModule->engine(), this);
+ widget->setResizeMode(QQuickWidget::SizeRootObjectToView);
+ d->quickWindow = widget->quickWindow();
d->quickWindow->setColor(QGuiApplication::palette().window().color());
#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
connect(qApp, &QGuiApplication::paletteChanged, [=]() {
d->quickWindow->setColor(QGuiApplication::palette().window().color());
});
#endif
- //The created widget takes ownership of the QWindow
- QWidget *widget = QWidget::createWindowContainer(d->quickWindow, this);
- d->configModule->mainUi()->setParentItem(d->quickWindow->contentItem());
+ QQmlComponent *component = new QQmlComponent(d->configModule->engine(), this);
+ component->setData(QByteArrayLiteral("import QtQuick 2.3\nItem{}"), QUrl());
+ QObject *root = component->create();
+ widget->setContent(QUrl(), component, root);
+
+ d->configModule->mainUi()->setParentItem(widget->rootObject());
+
//set anchors
QQmlExpression expr(d->configModule->engine()->rootContext(), d->configModule->mainUi(), QStringLiteral("parent"));
QQmlProperty prop(d->configModule->mainUi(), QStringLiteral("anchors.fill"));