Hello community, here is the log from the commit of package qqc2-desktop-style for openSUSE:Factory checked in at 2019-08-19 21:25:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qqc2-desktop-style (Old) and /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.22127 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qqc2-desktop-style" Mon Aug 19 21:25:17 2019 rev:25 rq:722509 version:5.61.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qqc2-desktop-style/qqc2-desktop-style.changes 2019-07-26 12:22:50.798524134 +0200 +++ /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.22127/qqc2-desktop-style.changes 2019-08-19 21:25:25.468670237 +0200 @@ -1,0 +2,23 @@ +Wed Aug 7 17:51:58 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Update to 5.61.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.61.0.php +- Changes since 5.60.0: + * Fix broken guard that prevents styling sliders with negative values + * Slow down the busy indicator's rotation speed + * Fix "Type error" when creating a TextField with focus: true + * [ComboBox] Set close policy to close on click outside instead of only outside parent (kde#408950) + * [SpinBox] Set renderType (kde#409888) + +------------------------------------------------------------------- +Fri Jul 19 11:49:21 UTC 2019 - Wolfgang Bauer <[email protected]> + +- Don't lower minimum Qt version anymore, it requires 5.11 now +- Drop patch to support Qt 5.9: + * 0001-Fix-MobileTextActionsToolBar.qml-with-Qt-5.9.patch +- Drop patch for Leap 42.3 which is EOL: + * fix-build-with-gcc48.patch + +------------------------------------------------------------------- Old: ---- 0001-Fix-MobileTextActionsToolBar.qml-with-Qt-5.9.patch fix-build-with-gcc48.patch qqc2-desktop-style-5.60.0.tar.xz New: ---- frameworks.keyring qqc2-desktop-style-5.61.0.tar.xz qqc2-desktop-style-5.61.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qqc2-desktop-style.spec ++++++ --- /var/tmp/diff_new_pack.A9BMCg/_old 2019-08-19 21:25:26.072670114 +0200 +++ /var/tmp/diff_new_pack.A9BMCg/_new 2019-08-19 21:25:26.072670114 +0200 @@ -16,19 +16,21 @@ # -%define _tar_path 5.60 +%define _tar_path 5.61 +# Only needed for the package signature condition +%bcond_without lang Name: qqc2-desktop-style -Version: 5.60.0 +Version: 5.61.0 Release: 0 Summary: A Qt Quick Controls 2 Style for Desktop UIs License: GPL-2.0-or-later Group: Development/Libraries/KDE URL: https://www.kde.org Source: https://download.kde.org/stable/frameworks/%{_tar_path}/qqc2-desktop-style-%{version}.tar.xz -# PATCH-FIX-OPENSUSE -Patch0: fix-build-with-gcc48.patch -# PATCH-FIX-OPENSUSE -Patch1: 0001-Fix-MobileTextActionsToolBar.qml-with-Qt-5.9.patch +%if %{with lang} +Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/qqc2-desktop-style-%{version}.tar.xz.sig +Source2: frameworks.keyring +%endif BuildRequires: extra-cmake-modules >= 0.0.8 # For dir ownership BuildRequires: kconfigwidgets-devel @@ -69,13 +71,6 @@ %prep %setup -q -%if 0%{?suse_version} < 1500 -%patch0 -p1 -%endif -%patch1 -p1 -%if 0%{?suse_version} == 1500 -sed -i -e "s/^set *(REQUIRED_QT_VERSION 5.10.0)$/set(REQUIRED_QT_VERSION 5.9.0)/" CMakeLists.txt -%endif %build %cmake_kf5 -d build ++++++ qqc2-desktop-style-5.60.0.tar.xz -> qqc2-desktop-style-5.61.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.60.0/CMakeLists.txt new/qqc2-desktop-style-5.61.0/CMakeLists.txt --- old/qqc2-desktop-style-5.60.0/CMakeLists.txt 2019-07-06 15:18:57.000000000 +0200 +++ new/qqc2-desktop-style-5.61.0/CMakeLists.txt 2019-08-03 21:36:58.000000000 +0200 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.60.0") # handled by release scripts -set(KF5_DEP_VERSION "5.60.0") # handled by release scripts +set(KF5_VERSION "5.61.0") # handled by release scripts +set(KF5_DEP_VERSION "5.61.0") # handled by release scripts project(qqc2-desktop-style VERSION ${KF5_VERSION}) @@ -21,10 +21,10 @@ ################# set KDE specific information ################# -find_package(ECM 5.60.0 REQUIRED NO_MODULE) +find_package(ECM 5.61.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}) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) include(ECMSetupVersion) include(ECMGenerateHeaders) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.60.0/org.kde.desktop/BusyIndicator.qml new/qqc2-desktop-style-5.61.0/org.kde.desktop/BusyIndicator.qml --- old/qqc2-desktop-style-5.60.0/org.kde.desktop/BusyIndicator.qml 2019-07-06 15:18:57.000000000 +0200 +++ new/qqc2-desktop-style-5.61.0/org.kde.desktop/BusyIndicator.qml 2019-08-03 21:36:58.000000000 +0200 @@ -53,7 +53,7 @@ from: 0 to: 360 loops: Animation.Infinite - duration: 1000 + duration: 2000 } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.60.0/org.kde.desktop/ComboBox.qml new/qqc2-desktop-style-5.61.0/org.kde.desktop/ComboBox.qml --- old/qqc2-desktop-style-5.60.0/org.kde.desktop/ComboBox.qml 2019-07-06 15:18:57.000000000 +0200 +++ new/qqc2-desktop-style-5.61.0/org.kde.desktop/ComboBox.qml 2019-08-03 21:36:58.000000000 +0200 @@ -206,6 +206,7 @@ Kirigami.Theme.colorSet: Kirigami.Theme.View Kirigami.Theme.inherit: controlRoot.Kirigami.Theme.inherit modal: true + closePolicy: Controls.Popup.CloseOnEscape | Controls.Popup.CloseOnPressOutside contentItem: ListView { id: listView diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.60.0/org.kde.desktop/SpinBox.qml new/qqc2-desktop-style-5.61.0/org.kde.desktop/SpinBox.qml --- old/qqc2-desktop-style-5.60.0/org.kde.desktop/SpinBox.qml 2019-07-06 15:18:57.000000000 +0200 +++ new/qqc2-desktop-style-5.61.0/org.kde.desktop/SpinBox.qml 2019-08-03 21:36:58.000000000 +0200 @@ -21,6 +21,7 @@ import QtQuick 2.6 +import QtQuick.Window 2.1 import QtQuick.Templates @QQC2_VERSION@ as T import org.kde.kirigami 2.4 as Kirigami import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate @@ -63,6 +64,10 @@ validator: controlRoot.validator inputMethodHints: Qt.ImhFormattedNumbersOnly + // Work around Qt bug where NativeRendering breaks for non-integer scale factors + // https://bugreports.qt.io/browse/QTBUG-67007 + renderType: Screen.devicePixelRatio % 1 !== 0 ? Text.QtRendering : Text.NativeRendering + MouseArea { anchors.fill: parent onPressed: mouse.accepted = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.60.0/org.kde.desktop/private/MobileTextActionsToolBar.qml new/qqc2-desktop-style-5.61.0/org.kde.desktop/private/MobileTextActionsToolBar.qml --- old/qqc2-desktop-style-5.60.0/org.kde.desktop/private/MobileTextActionsToolBar.qml 2019-07-06 15:18:57.000000000 +0200 +++ new/qqc2-desktop-style-5.61.0/org.kde.desktop/private/MobileTextActionsToolBar.qml 2019-08-03 21:36:58.000000000 +0200 @@ -35,11 +35,16 @@ closePolicy: Popup.NoAutoClose property bool shouldBeVisible: false - x: controlRoot ? Math.min(Math.max(0, controlRoot.mapToItem(root.parent, controlRoot.positionToRectangle(controlRoot.selectionStart).x, 0).x - root.width/2), controlRoot.Window.contentItem.width - root.width) : 0 + x: { + if (!controlRoot || !controlRoot.Window.contentItem) { + return 0; + } + return Math.min(Math.max(0, controlRoot.mapToItem(root.parent, controlRoot.positionToRectangle(controlRoot.selectionStart).x, 0).x - root.width/2), controlRoot.Window.contentItem.width - root.width); + } y: { - if (!controlRoot) { - return false; + if (!controlRoot || !controlRoot.Window.contentItem) { + return 0; } var desiredY = controlRoot.mapToItem(root.parent, 0, controlRoot.positionToRectangle(controlRoot.selectionStart).y).y - root.height; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.60.0/plugin/kquickstyleitem.cpp new/qqc2-desktop-style-5.61.0/plugin/kquickstyleitem.cpp --- old/qqc2-desktop-style-5.60.0/plugin/kquickstyleitem.cpp 2019-07-06 15:18:57.000000000 +0200 +++ new/qqc2-desktop-style-5.61.0/plugin/kquickstyleitem.cpp 2019-08-03 21:36:58.000000000 +0200 @@ -597,8 +597,12 @@ QStyleOptionSlider *opt = qstyleoption_cast<QStyleOptionSlider*>(m_styleoption); opt->orientation = horizontal() ? Qt::Horizontal : Qt::Vertical; opt->upsideDown = !horizontal(); - opt->minimum = qMax(0, minimum()); - opt->maximum = qMax(0, maximum()); + + int min = minimum(); + int max = std::max(min, maximum()); + + opt->minimum = min; + opt->maximum = max; opt->sliderPosition = value(); opt->singleStep = step(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.60.0/tests/LineEditWithClearButton.qml new/qqc2-desktop-style-5.61.0/tests/LineEditWithClearButton.qml --- old/qqc2-desktop-style-5.60.0/tests/LineEditWithClearButton.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/qqc2-desktop-style-5.61.0/tests/LineEditWithClearButton.qml 2019-08-03 21:36:58.000000000 +0200 @@ -0,0 +1,35 @@ +/* + Copyright (c) 2019 Montel Laurent <[email protected]> + + This library 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 of the License or + ( at your option ) version 3 or, at the discretion of KDE e.V. + ( which shall act as a proxy as in section 14 of the GPLv3 ), any later version. + + This library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +import org.kde.kirigami 2.7 as Kirigami +Kirigami.ActionTextField { + id: __searchField + focus: true + rightActions: [ + Kirigami.Action { + iconName: "edit-clear" + visible: __searchField.text !== "" + onTriggered: { + __searchField.text = "" + __searchField.accepted() + } + } + ] +}
