Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qqc2-desktop-style for openSUSE:Factory checked in at 2022-05-16 18:07:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qqc2-desktop-style (Old) and /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qqc2-desktop-style" Mon May 16 18:07:26 2022 rev:58 rq:977215 version:5.94.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qqc2-desktop-style/qqc2-desktop-style.changes 2022-04-11 23:49:29.806897126 +0200 +++ /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.1538/qqc2-desktop-style.changes 2022-05-16 18:09:37.781331252 +0200 @@ -1,0 +2,14 @@ +Tue May 10 08:18:16 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.94.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.94.0 +- Changes since 5.93.0: + * Add windows CI + * Remove infoChanged signal from KQuickStyleItem + * Replace connect to self in KQuickStyleItem with direct method calls + * Recalculate metrics when tablet mode changes + * Fix use of a no longer existing id + +------------------------------------------------------------------- Old: ---- qqc2-desktop-style-5.93.0.tar.xz qqc2-desktop-style-5.93.0.tar.xz.sig New: ---- qqc2-desktop-style-5.94.0.tar.xz qqc2-desktop-style-5.94.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qqc2-desktop-style.spec ++++++ --- /var/tmp/diff_new_pack.hRrxsy/_old 2022-05-16 18:09:38.321331681 +0200 +++ /var/tmp/diff_new_pack.hRrxsy/_new 2022-05-16 18:09:38.325331684 +0200 @@ -16,11 +16,11 @@ # -%define _tar_path 5.93 +%define _tar_path 5.94 # Only needed for the package signature condition %bcond_without released Name: qqc2-desktop-style -Version: 5.93.0 +Version: 5.94.0 Release: 0 Summary: A Qt Quick Controls 2 Style for Desktop UIs License: GPL-2.0-or-later ++++++ qqc2-desktop-style-5.93.0.tar.xz -> qqc2-desktop-style-5.94.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.93.0/.gitlab-ci.yml new/qqc2-desktop-style-5.94.0/.gitlab-ci.yml --- old/qqc2-desktop-style-5.93.0/.gitlab-ci.yml 2022-04-02 12:05:59.000000000 +0200 +++ new/qqc2-desktop-style-5.94.0/.gitlab-ci.yml 2022-04-10 00:16:59.000000000 +0200 @@ -5,3 +5,4 @@ - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.93.0/CMakeLists.txt new/qqc2-desktop-style-5.94.0/CMakeLists.txt --- old/qqc2-desktop-style-5.93.0/CMakeLists.txt 2022-04-02 12:05:59.000000000 +0200 +++ new/qqc2-desktop-style-5.94.0/CMakeLists.txt 2022-04-10 00:16:59.000000000 +0200 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.93.0") # handled by release scripts +set(KF_VERSION "5.94.0") # handled by release scripts set(KF_DEP_VERSION "5.93.0") # handled by release scripts project(qqc2-desktop-style VERSION ${KF_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.93.0/org.kde.desktop/ComboBox.qml new/qqc2-desktop-style-5.94.0/org.kde.desktop/ComboBox.qml --- old/qqc2-desktop-style-5.93.0/org.kde.desktop/ComboBox.qml 2022-04-02 12:05:59.000000000 +0200 +++ new/qqc2-desktop-style-5.94.0/org.kde.desktop/ComboBox.qml 2022-04-10 00:16:59.000000000 +0200 @@ -86,7 +86,7 @@ onFocusChanged: { if (focus) { - Private.MobileTextActionsToolBar.controlRoot = textField; + Private.MobileTextActionsToolBar.controlRoot = this; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.93.0/org.kde.desktop/Slider.qml new/qqc2-desktop-style-5.94.0/org.kde.desktop/Slider.qml --- old/qqc2-desktop-style-5.93.0/org.kde.desktop/Slider.qml 2022-04-02 12:05:59.000000000 +0200 +++ new/qqc2-desktop-style-5.94.0/org.kde.desktop/Slider.qml 2022-04-10 00:16:59.000000000 +0200 @@ -32,8 +32,8 @@ elementType: "slider" sunken: controlRoot.pressed implicitWidth: 200 - contentWidth: horizontal ? controlRoot.implicitWidth : 22 - contentHeight: horizontal ? 22 : controlRoot.implicitHeight + contentWidth: horizontal ? controlRoot.implicitWidth : (Kirigami.Settings.tabletMode ? 24 : 22) + contentHeight: horizontal ? (Kirigami.Settings.tabletMode ? 24 : 22) : controlRoot.implicitHeight anchors.verticalCenter: controlRoot.verticalCenter maximum: controlRoot.to*100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.93.0/plugin/kquickstyleitem.cpp new/qqc2-desktop-style-5.94.0/plugin/kquickstyleitem.cpp --- old/qqc2-desktop-style-5.93.0/plugin/kquickstyleitem.cpp 2022-04-02 12:05:59.000000000 +0200 +++ new/qqc2-desktop-style-5.94.0/plugin/kquickstyleitem.cpp 2022-04-10 00:16:59.000000000 +0200 @@ -24,6 +24,7 @@ #include <ksharedconfig.h> #include <Kirigami/PlatformTheme> +#include <Kirigami/TabletModeWatcher> QStyle *KQuickStyleItem::s_style = nullptr; @@ -76,41 +77,9 @@ setFlag(QQuickItem::ItemHasContents, true); setSmooth(false); - connect(this, &KQuickStyleItem::visibleChanged, this, &KQuickStyleItem::updateItem); - connect(this, &KQuickStyleItem::widthChanged, this, &KQuickStyleItem::updateItem); - connect(this, &KQuickStyleItem::heightChanged, this, &KQuickStyleItem::updateItem); - connect(this, &KQuickStyleItem::enabledChanged, this, &KQuickStyleItem::updateItem); - connect(this, &KQuickStyleItem::infoChanged, this, &KQuickStyleItem::updateItem); - connect(this, &KQuickStyleItem::onChanged, this, &KQuickStyleItem::updateItem); - connect(this, &KQuickStyleItem::selectedChanged, this, &KQuickStyleItem::updateItem); - connect(this, &KQuickStyleItem::activeChanged, this, &KQuickStyleItem::updateItem); - connect(this, &KQuickStyleItem::textChanged, this, &KQuickStyleItem::updateSizeHint); - connect(this, &KQuickStyleItem::textChanged, this, &KQuickStyleItem::updateItem); - connect(this, &KQuickStyleItem::activeChanged, this, &KQuickStyleItem::updateItem); - connect(this, &KQuickStyleItem::flatChanged, this, &KQuickStyleItem::updateItem); - connect(this, &KQuickStyleItem::sunkenChanged, this, &KQuickStyleItem::updateItem); - connect(this, &KQuickStyleItem::hoverChanged, this, &KQuickStyleItem::updateItem); - connect(this, &KQuickStyleItem::maximumChanged, this, &KQuickStyleItem::updateItem); - connect(this, &KQuickStyleItem::minimumChanged, this, &KQuickStyleItem::updateItem); - connect(this, &KQuickStyleItem::valueChanged, this, &KQuickStyleItem::updateItem); - connect(this, &KQuickStyleItem::horizontalChanged, this, &KQuickStyleItem::updateItem); - connect(this, &KQuickStyleItem::transientChanged, this, &KQuickStyleItem::updateItem); - connect(this, &KQuickStyleItem::activeControlChanged, this, &KQuickStyleItem::updateItem); - connect(this, &KQuickStyleItem::hasFocusChanged, this, &KQuickStyleItem::updateItem); - connect(this, &KQuickStyleItem::activeControlChanged, this, &KQuickStyleItem::updateItem); - connect(this, &KQuickStyleItem::hintChanged, this, &KQuickStyleItem::updateItem); - connect(this, &KQuickStyleItem::propertiesChanged, this, &KQuickStyleItem::updateSizeHint); - connect(this, &KQuickStyleItem::propertiesChanged, this, &KQuickStyleItem::updateItem); - connect(this, &KQuickStyleItem::elementTypeChanged, this, &KQuickStyleItem::updateItem); - connect(this, &KQuickStyleItem::contentWidthChanged, this, &KQuickStyleItem::updateSizeHint); - connect(this, &KQuickStyleItem::contentHeightChanged, this, &KQuickStyleItem::updateSizeHint); - connect(this, &KQuickStyleItem::widthChanged, this, &KQuickStyleItem::updateRect); - connect(this, &KQuickStyleItem::heightChanged, this, &KQuickStyleItem::updateRect); - - connect(this, &KQuickStyleItem::heightChanged, this, &KQuickStyleItem::updateBaselineOffset); - connect(this, &KQuickStyleItem::contentHeightChanged, this, &KQuickStyleItem::updateBaselineOffset); - connect(qApp, &QApplication::fontChanged, this, &KQuickStyleItem::updateSizeHint, Qt::QueuedConnection); + + Kirigami::TabletModeWatcher::self()->addWatcher(this); } KQuickStyleItem::~KQuickStyleItem() @@ -150,6 +119,7 @@ } m_styleoption = nullptr; + Kirigami::TabletModeWatcher::self()->removeWatcher(this); } void KQuickStyleItem::initStyleOption() @@ -777,6 +747,7 @@ } else if (sizeHint == QLatin1String("small")) { m_styleoption->state |= QStyle::State_Small; } + } QIcon KQuickStyleItem::iconFromIconProperty() const @@ -1234,6 +1205,7 @@ { if (m_contentWidth != arg) { m_contentWidth = arg; + updateSizeHint(); Q_EMIT contentWidthChanged(arg); } } @@ -1242,6 +1214,8 @@ { if (m_contentHeight != arg) { m_contentHeight = arg; + updateSizeHint(); + updateBaselineOffset(); Q_EMIT contentHeightChanged(arg); } } @@ -1366,6 +1340,7 @@ m_hints = str; initStyleOption(); updateSizeHint(); + polish(); if (m_styleoption->state & QStyle::State_Mini) { m_font.setPointSize(9.); Q_EMIT fontChanged(); @@ -1473,6 +1448,7 @@ Q_EMIT topPaddingChanged(); Q_EMIT bottomPaddingChanged(); updateSizeHint(); + polish(); } QRectF KQuickStyleItem::subControlRect(const QString &subcontrolString) @@ -1781,7 +1757,16 @@ polish(); } return true; + } else if (ev->type() == Kirigami::TabletModeChangedEvent::type) { + Q_EMIT leftPaddingChanged(); + Q_EMIT rightPaddingChanged(); + Q_EMIT topPaddingChanged(); + Q_EMIT bottomPaddingChanged(); + updateSizeHint(); + polish(); + return true; } + return QQuickItem::event(ev); } @@ -1919,6 +1904,35 @@ return QQuickItem::eventFilter(watched, event); } +void KQuickStyleItem::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &value) +{ + if (change == QQuickItem::ItemVisibleHasChanged || change == QQuickItem::ItemEnabledHasChanged) { + polish(); + } + + QQuickItem::itemChange(change, value); +} + +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +void KQuickStyleItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) +{ + QQuickItem::geometryChanged(newGeometry, oldGeometry); +#else +void KQuickStyleItem::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) +{ + QQuickItem::geometryChange(newGeometry, oldGeometry); +#endif + + if (!newGeometry.isEmpty() && newGeometry != oldGeometry) { + polish(); + updateRect(); + + if (newGeometry.height() != oldGeometry.height()) { + updateBaselineOffset(); + } + } +} + void KQuickStyleItem::styleChanged() { if (!qApp->style() || QApplication::closingDown()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.93.0/plugin/kquickstyleitem_p.h new/qqc2-desktop-style-5.94.0/plugin/kquickstyleitem_p.h --- old/qqc2-desktop-style-5.93.0/plugin/kquickstyleitem_p.h 2022-04-02 12:05:59.000000000 +0200 +++ new/qqc2-desktop-style-5.94.0/plugin/kquickstyleitem_p.h 2022-04-10 00:16:59.000000000 +0200 @@ -227,6 +227,7 @@ { if (m_sunken != sunken) { m_sunken = sunken; + polish(); Q_EMIT sunkenChanged(); } } @@ -234,6 +235,7 @@ { if (m_raised != raised) { m_raised = raised; + polish(); Q_EMIT raisedChanged(); } } @@ -241,6 +243,7 @@ { if (m_flat != flat) { m_flat = flat; + polish(); Q_EMIT flatChanged(); } } @@ -248,6 +251,7 @@ { if (m_active != active) { m_active = active; + polish(); Q_EMIT activeChanged(); } } @@ -255,6 +259,7 @@ { if (m_selected != selected) { m_selected = selected; + polish(); Q_EMIT selectedChanged(); } } @@ -262,6 +267,7 @@ { if (m_focus != focus) { m_focus = focus; + polish(); Q_EMIT hasFocusChanged(); } } @@ -269,6 +275,7 @@ { if (m_on != on) { m_on = on; + polish(); Q_EMIT onChanged(); } } @@ -276,6 +283,7 @@ { if (m_hover != hover) { m_hover = hover; + polish(); Q_EMIT hoverChanged(); } } @@ -283,6 +291,7 @@ { if (m_horizontal != horizontal) { m_horizontal = horizontal; + polish(); Q_EMIT horizontalChanged(); } } @@ -290,6 +299,7 @@ { if (m_transient != transient) { m_transient = transient; + polish(); Q_EMIT transientChanged(); } } @@ -297,6 +307,7 @@ { if (m_minimum != minimum) { m_minimum = minimum; + polish(); Q_EMIT minimumChanged(); } } @@ -304,6 +315,7 @@ { if (m_maximum != maximum) { m_maximum = maximum; + polish(); Q_EMIT maximumChanged(); } } @@ -311,6 +323,7 @@ { if (m_value != value) { m_value = value; + polish(); Q_EMIT valueChanged(); } } @@ -318,6 +331,7 @@ { if (m_step != step) { m_step = step; + polish(); Q_EMIT stepChanged(); } } @@ -325,6 +339,7 @@ { if (m_paintMargins != value) { m_paintMargins = value; + polish(); Q_EMIT paintMarginsChanged(); } } @@ -333,6 +348,8 @@ { if (m_text != str) { m_text = str; + updateSizeHint(); + polish(); Q_EMIT textChanged(); } } @@ -340,6 +357,7 @@ { if (m_activeControl != str) { m_activeControl = str; + polish(); Q_EMIT activeControlChanged(); } } @@ -349,6 +367,8 @@ if (m_properties != props) { m_properties = props; m_iconDirty = true; + updateSizeHint(); + polish(); Q_EMIT propertiesChanged(); } } @@ -429,7 +449,6 @@ void stepChanged(); void valueChanged(); void activeControlChanged(); - void infoChanged(); void styleNameChanged(); void paintMarginsChanged(); void hintChanged(); @@ -453,6 +472,13 @@ QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override; void updatePolish() override; bool eventFilter(QObject *watched, QEvent *event) override; + void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &value) override; + +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; +#else + void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override; +#endif private: QIcon iconFromIconProperty() const;
