Hello community, here is the log from the commit of package qqc2-desktop-style for openSUSE:Factory checked in at 2019-07-26 12:22:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qqc2-desktop-style (Old) and /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qqc2-desktop-style" Fri Jul 26 12:22:47 2019 rev:24 rq:715921 version:5.60.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qqc2-desktop-style/qqc2-desktop-style.changes 2019-06-22 11:16:11.212900851 +0200 +++ /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.4126/qqc2-desktop-style.changes 2019-07-26 12:22:50.798524134 +0200 @@ -1,0 +2,18 @@ +Sun Jul 14 06:41:40 UTC 2019 - [email protected] + +- Update to 5.60.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.60.0.php +- Changes since 5.59.0: + * Remove Qt 5.11 ifdef since we require that version now + * MobileTextActionsToolBar: fix runtime warnings when controlRoot isn't set yet (kde#408719) + * Show shortcut in menu item when specified (kde#405541) + * Add MenuSeparator + * Fix ToolButton remaining in a pressed state after press + * [ToolButton] Pass custom icon size to StyleItem + * honor visibility policy (kde#407014) +- Refreshed patches: + * 0001-Fix-MobileTextActionsToolBar.qml-with-Qt-5.9.patch + +------------------------------------------------------------------- Old: ---- qqc2-desktop-style-5.59.0.tar.xz New: ---- qqc2-desktop-style-5.60.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qqc2-desktop-style.spec ++++++ --- /var/tmp/diff_new_pack.aRPLjo/_old 2019-07-26 12:22:51.314523932 +0200 +++ /var/tmp/diff_new_pack.aRPLjo/_new 2019-07-26 12:22:51.314523932 +0200 @@ -16,9 +16,9 @@ # -%define _tar_path 5.59 +%define _tar_path 5.60 Name: qqc2-desktop-style -Version: 5.59.0 +Version: 5.60.0 Release: 0 Summary: A Qt Quick Controls 2 Style for Desktop UIs License: GPL-2.0-or-later ++++++ 0001-Fix-MobileTextActionsToolBar.qml-with-Qt-5.9.patch ++++++ --- /var/tmp/diff_new_pack.aRPLjo/_old 2019-07-26 12:22:51.330523926 +0200 +++ /var/tmp/diff_new_pack.aRPLjo/_new 2019-07-26 12:22:51.334523924 +0200 @@ -7,17 +7,17 @@ org.kde.desktop/private/MobileTextActionsToolBar.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -Index: qqc2-desktop-style-5.56.0git.20190424T214652~06ea48c/org.kde.desktop/private/MobileTextActionsToolBar.qml +Index: qqc2-desktop-style-5.56.0git.20190701T123327~a759ed5/org.kde.desktop/private/MobileTextActionsToolBar.qml =================================================================== ---- qqc2-desktop-style-5.56.0git.20190424T214652~06ea48c.orig/org.kde.desktop/private/MobileTextActionsToolBar.qml 2019-04-25 08:40:38.789971927 +0200 -+++ qqc2-desktop-style-5.56.0git.20190424T214652~06ea48c/org.kde.desktop/private/MobileTextActionsToolBar.qml 2019-04-25 08:42:16.320959453 +0200 +--- qqc2-desktop-style-5.56.0git.20190701T123327~a759ed5.orig/org.kde.desktop/private/MobileTextActionsToolBar.qml 2019-07-03 06:58:33.450667047 +0200 ++++ qqc2-desktop-style-5.56.0git.20190701T123327~a759ed5/org.kde.desktop/private/MobileTextActionsToolBar.qml 2019-07-03 07:00:45.391671003 +0200 @@ -58,7 +58,7 @@ contentItem: RowLayout { ToolButton { focusPolicy: Qt.NoFocus - icon.name: "edit-cut" + @DISABLE_UNDER_QQC2_2_3@ icon.name: "edit-cut" - visible: controlRoot.selectedText.length > 0 && (!controlRoot.hasOwnProperty("echoMode") || controlRoot.echoMode === TextInput.Normal) + visible: controlRoot && controlRoot.selectedText.length > 0 && (!controlRoot.hasOwnProperty("echoMode") || controlRoot.echoMode === TextInput.Normal) onClicked: { controlRoot.cut(); @@ -66,7 +66,7 @@ @@ -26,7 +26,7 @@ focusPolicy: Qt.NoFocus - icon.name: "edit-copy" + @DISABLE_UNDER_QQC2_2_3@ icon.name: "edit-copy" - visible: controlRoot.selectedText.length > 0 && (!controlRoot.hasOwnProperty("echoMode") || controlRoot.echoMode === TextInput.Normal) + visible: controlRoot && controlRoot.selectedText.length > 0 && (!controlRoot.hasOwnProperty("echoMode") || controlRoot.echoMode === TextInput.Normal) onClicked: { controlRoot.copy(); @@ -74,7 +74,7 @@ @@ -35,6 +35,6 @@ focusPolicy: Qt.NoFocus - icon.name: "edit-paste" + @DISABLE_UNDER_QQC2_2_3@ icon.name: "edit-paste" - visible: controlRoot.canPaste + visible: controlRoot && controlRoot.canPaste onClicked: { controlRoot.paste(); ++++++ qqc2-desktop-style-5.59.0.tar.xz -> qqc2-desktop-style-5.60.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.59.0/CMakeLists.txt new/qqc2-desktop-style-5.60.0/CMakeLists.txt --- old/qqc2-desktop-style-5.59.0/CMakeLists.txt 2019-06-01 18:42:00.000000000 +0200 +++ new/qqc2-desktop-style-5.60.0/CMakeLists.txt 2019-07-06 15:18:57.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.59.0") # handled by release scripts -set(KF5_DEP_VERSION "5.59.0") # handled by release scripts +set(KF5_VERSION "5.60.0") # handled by release scripts +set(KF5_DEP_VERSION "5.60.0") # handled by release scripts project(qqc2-desktop-style VERSION ${KF5_VERSION}) -set(REQUIRED_QT_VERSION 5.10.0) +set(REQUIRED_QT_VERSION 5.11.0) ################# Disallow in-source build ################# @@ -21,7 +21,7 @@ ################# set KDE specific information ################# -find_package(ECM 5.59.0 REQUIRED NO_MODULE) +find_package(ECM 5.60.0 REQUIRED NO_MODULE) # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.59.0/org.kde.desktop/MenuItem.qml new/qqc2-desktop-style-5.60.0/org.kde.desktop/MenuItem.qml --- old/qqc2-desktop-style-5.59.0/org.kde.desktop/MenuItem.qml 2019-06-01 18:42:00.000000000 +0200 +++ new/qqc2-desktop-style-5.60.0/org.kde.desktop/MenuItem.qml 2019-07-06 15:18:57.000000000 +0200 @@ -87,6 +87,20 @@ horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } + Label { + id: shortcut + Layout.alignment: Qt.AlignVCenter + + visible: controlRoot.action && controlRoot.action.hasOwnProperty("shortcut") && controlRoot.action.shortcut !== undefined + text: visible ? controlRoot.action.shortcut : "" + font: controlRoot.font + color: label.color + horizontalAlignment: Text.AlignRight + verticalAlignment: Text.AlignVCenter + } + Item { + Layout.preferredWidth: Kirigami.Units.smallSpacing + } } //we can't use arrow: on old qqc2 releases diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.59.0/org.kde.desktop/MenuSeparator.qml new/qqc2-desktop-style-5.60.0/org.kde.desktop/MenuSeparator.qml --- old/qqc2-desktop-style-5.59.0/org.kde.desktop/MenuSeparator.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/qqc2-desktop-style-5.60.0/org.kde.desktop/MenuSeparator.qml 2019-07-06 15:18:57.000000000 +0200 @@ -0,0 +1,38 @@ +/* + * Copyright 2019 Alexander Stippich <[email protected]> + * Copyright 2017 The Qt Company Ltd. + * + * GNU Lesser General Public License Usage + * Alternatively, this file may be used under the terms of the GNU Lesser + * General Public License version 3 as published by the Free Software + * Foundation and appearing in the file LICENSE.LGPLv3 included in the + * packaging of this file. Please review the following information to + * ensure the GNU Lesser General Public License version 3 requirements + * will be met: https://www.gnu.org/licenses/lgpl.html. + * + * GNU General Public License Usage + * Alternatively, this file may be used under the terms of the GNU + * General Public License version 2.0 or later as published by the Free + * Software Foundation and appearing in the file LICENSE.GPL included in + * the packaging of this file. Please review the following information to + * ensure the GNU General Public License version 2.0 requirements will be + * met: http://www.gnu.org/licenses/gpl-2.0.html. + */ + + +import QtQuick 2.6 +import QtQuick.Templates @QQC2_VERSION@ as T +import org.kde.kirigami 2.4 as Kirigami + +T.MenuSeparator { + id: controlRoot + + implicitHeight: Kirigami.Units.smallSpacing + separator.height + width: parent.width + + background: Kirigami.Separator { + id: separator + anchors.centerIn: controlRoot + width: controlRoot.width + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.59.0/org.kde.desktop/ScrollBar.qml new/qqc2-desktop-style-5.60.0/org.kde.desktop/ScrollBar.qml --- old/qqc2-desktop-style-5.59.0/org.kde.desktop/ScrollBar.qml 2019-06-01 18:42:00.000000000 +0200 +++ new/qqc2-desktop-style-5.60.0/org.kde.desktop/ScrollBar.qml 2019-07-06 15:18:57.000000000 +0200 @@ -34,7 +34,7 @@ hoverEnabled: true - visible: controlRoot.size < 1.0 + visible: controlRoot.size < 1.0 && controlRoot.policy !== T.ScrollBar.AlwaysOff stepSize: 0.02 background: MouseArea { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.59.0/org.kde.desktop/ToolButton.qml new/qqc2-desktop-style-5.60.0/org.kde.desktop/ToolButton.qml --- old/qqc2-desktop-style-5.59.0/org.kde.desktop/ToolButton.qml 2019-06-01 18:42:00.000000000 +0200 +++ new/qqc2-desktop-style-5.60.0/org.kde.desktop/ToolButton.qml 2019-07-06 15:18:57.000000000 +0200 @@ -53,8 +53,7 @@ anchors.fill:parent control: controlRoot elementType: controlRoot.flat ? "toolbutton" : "button" - sunken: controlRoot.pressed || (controlRoot.checkable && controlRoot.checked) - raised: !(controlRoot.pressed || (controlRoot.checkable && controlRoot.checked)) + on: controlRoot.pressed || (controlRoot.checkable && controlRoot.checked) hover: controlRoot.hovered text: controlRoot.Kirigami.MnemonicData.mnemonicLabel hasFocus: false @@ -62,6 +61,8 @@ properties: { "icon": controlRoot.icon ? (controlRoot.icon.name || controlRoot.icon.source) : "", "iconColor": controlRoot.icon && controlRoot.icon.color.a > 0? controlRoot.icon.color : Kirigami.Theme.textColor, + "iconWidth": controlRoot.icon ? controlRoot.icon.width : 0, + "iconHeight": controlRoot.icon ? controlRoot.icon.height : 0, "toolButtonStyle": controlRoot.display == T.ToolButton.IconOnly ? Qt.ToolButtonIconOnly : controlRoot.display == T.ToolButton.TextOnly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.59.0/org.kde.desktop/private/MobileTextActionsToolBar.qml new/qqc2-desktop-style-5.60.0/org.kde.desktop/private/MobileTextActionsToolBar.qml --- old/qqc2-desktop-style-5.59.0/org.kde.desktop/private/MobileTextActionsToolBar.qml 2019-06-01 18:42:00.000000000 +0200 +++ new/qqc2-desktop-style-5.60.0/org.kde.desktop/private/MobileTextActionsToolBar.qml 2019-07-06 15:18:57.000000000 +0200 @@ -59,7 +59,7 @@ ToolButton { focusPolicy: Qt.NoFocus icon.name: "edit-cut" - visible: controlRoot.selectedText.length > 0 && (!controlRoot.hasOwnProperty("echoMode") || controlRoot.echoMode === TextInput.Normal) + visible: controlRoot && controlRoot.selectedText.length > 0 && (!controlRoot.hasOwnProperty("echoMode") || controlRoot.echoMode === TextInput.Normal) onClicked: { controlRoot.cut(); } @@ -67,7 +67,7 @@ ToolButton { focusPolicy: Qt.NoFocus icon.name: "edit-copy" - visible: controlRoot.selectedText.length > 0 && (!controlRoot.hasOwnProperty("echoMode") || controlRoot.echoMode === TextInput.Normal) + visible: controlRoot && controlRoot.selectedText.length > 0 && (!controlRoot.hasOwnProperty("echoMode") || controlRoot.echoMode === TextInput.Normal) onClicked: { controlRoot.copy(); } @@ -75,7 +75,7 @@ ToolButton { focusPolicy: Qt.NoFocus icon.name: "edit-paste" - visible: controlRoot.canPaste + visible: controlRoot && controlRoot.canPaste onClicked: { controlRoot.paste(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.59.0/plugin/kquickstyleitem.cpp new/qqc2-desktop-style-5.60.0/plugin/kquickstyleitem.cpp --- old/qqc2-desktop-style-5.59.0/plugin/kquickstyleitem.cpp 2019-06-01 18:42:00.000000000 +0200 +++ new/qqc2-desktop-style-5.60.0/plugin/kquickstyleitem.cpp 2019-07-06 15:18:57.000000000 +0200 @@ -786,15 +786,11 @@ return; const QVariant controlPalette = m_control ? m_control->property("palette") : QVariant(); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)) if (controlPalette.isValid()) { m_styleoption->palette = controlPalette.value<QPalette>(); } else { m_styleoption->palette = m_theme->palette(); } -#else - m_styleoption->palette = m_theme->palette(); -#endif } /*
