Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qqc2-breeze-style for
openSUSE:Factory checked in at 2022-02-17 00:30:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qqc2-breeze-style (Old)
and /work/SRC/openSUSE:Factory/.qqc2-breeze-style.new.1956 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qqc2-breeze-style"
Thu Feb 17 00:30:45 2022 rev:20 rq:955276 version:5.24.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/qqc2-breeze-style/qqc2-breeze-style.changes
2022-02-07 23:38:14.158384683 +0100
+++
/work/SRC/openSUSE:Factory/.qqc2-breeze-style.new.1956/qqc2-breeze-style.changes
2022-02-17 00:32:02.097417742 +0100
@@ -1,0 +2,12 @@
+Tue Feb 15 19:18:21 UTC 2022 - Fabian Vogt <[email protected]>
+
+- Update to 5.24.1
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/plasma/5/5.24.1
+- Changes since 5.24.0:
+ * Use correct DBus signal for listening for font changes
+ * Avoid needlessly reading font settings
+ * Use raw pointer instead of QPointer to track watchers
+
+-------------------------------------------------------------------
Old:
----
qqc2-breeze-style-5.24.0.tar.xz
qqc2-breeze-style-5.24.0.tar.xz.sig
New:
----
qqc2-breeze-style-5.24.1.tar.xz
qqc2-breeze-style-5.24.1.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qqc2-breeze-style.spec ++++++
--- /var/tmp/diff_new_pack.c7VCM0/_old 2022-02-17 00:32:02.673417643 +0100
+++ /var/tmp/diff_new_pack.c7VCM0/_new 2022-02-17 00:32:02.677417642 +0100
@@ -18,15 +18,15 @@
%bcond_without released
Name: qqc2-breeze-style
-Version: 5.24.0
+Version: 5.24.1
Release: 0
Summary: Breeze Style for Qt Quick Controls 2
License: LGPL-2.1-only OR LGPL-3.0-only
Group: System/Libraries
URL: https://www.kde.org
-Source: qqc2-breeze-style-%{version}.tar.xz
+Source:
https://download.kde.org/stable/plasma/%{version}/qqc2-breeze-style-%{version}.tar.xz
%if %{with released}
-Source1: qqc2-breeze-style-%{version}.tar.xz.sig
+Source1:
https://download.kde.org/stable/plasma/%{version}/qqc2-breeze-style-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
BuildRequires: extra-cmake-modules
++++++ qqc2-breeze-style-5.24.0.tar.xz -> qqc2-breeze-style-5.24.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-breeze-style-5.24.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
new/qqc2-breeze-style-5.24.1/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
---
old/qqc2-breeze-style-5.24.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
2022-02-03 15:47:55.000000000 +0100
+++
new/qqc2-breeze-style-5.24.1/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
2022-02-15 13:46:09.000000000 +0100
@@ -43,18 +43,19 @@
connect(qGuiApp, &QGuiApplication::paletteChanged, this,
&StyleSingleton::refresh);
#ifndef Q_OS_ANDROID
- // Use DBus in order to listen for kdeglobals changes directly, as the
+ // Use DBus in order to listen for settings changes directly, as the
// QApplication doesn't expose the font variants we're looking for,
// namely smallFont.
QDBusConnection::sessionBus().connect(QString(),
-
QStringLiteral("/KGlobalSettings"),
-
QStringLiteral("org.kde.KGlobalSettings"),
- QStringLiteral("notifyChange"),
+
QStringLiteral("/KDEPlatformTheme"),
+
QStringLiteral("org.kde.KDEPlatformTheme"),
+ QStringLiteral("refreshFonts"),
this,
SLOT(notifyWatchersConfigurationChange()));
#endif
connect(qGuiApp, &QGuiApplication::fontDatabaseChanged, this,
&StyleSingleton::notifyWatchersConfigurationChange);
+ connect(qGuiApp, &QGuiApplication::fontChanged, this,
&StyleSingleton::notifyWatchersConfigurationChange);
/* QtTextRendering uses less memory, so use it in low power mode.
*
@@ -83,6 +84,26 @@
}
QQuickWindow::setTextRenderType(defaultTextRenderType);
+
+ smallFont = loadSmallFont();
+ }
+
+ QFont loadSmallFont() const
+ {
+ KSharedConfigPtr ptr = KSharedConfig::openConfig();
+ KConfigGroup general(ptr->group("general"));
+
+ return general.readEntry("smallestReadableFont", []() {
+ auto smallFont = qApp->font();
+#ifndef Q_OS_WIN
+ if (smallFont.pixelSize() != -1) {
+ smallFont.setPixelSize(smallFont.pixelSize() - 2);
+ } else {
+ smallFont.setPointSize(smallFont.pointSize() - 2);
+ }
+#endif
+ return smallFont;
+ }());
}
void refresh()
@@ -177,14 +198,17 @@
Q_SLOT void notifyWatchersConfigurationChange()
{
+ smallFont = loadSmallFont();
for (auto watcher : qAsConst(watchers)) {
- watcher->syncFont();
+ watcher->setSmallFont(smallFont);
+ watcher->setDefaultFont(qApp->font());
}
}
KColorScheme buttonScheme;
+ QFont smallFont;
- QVector<QPointer<PlasmaDesktopTheme>> watchers;
+ QVector<PlasmaDesktopTheme *> watchers;
private:
QHash<QPair<Kirigami::PlatformTheme::ColorSet, QPalette::ColorGroup>,
Colors> m_cache;
@@ -210,7 +234,9 @@
(*s_style)->watchers.append(this);
- syncFont();
+ setDefaultFont(qGuiApp->font());
+ setSmallFont((*s_style)->smallFont);
+
syncWindow();
syncColors();
}
@@ -248,23 +274,6 @@
}
}
-void PlasmaDesktopTheme::syncFont()
-{
- KSharedConfigPtr ptr = KSharedConfig::openConfig();
- KConfigGroup general(ptr->group("general"));
- setSmallFont(general.readEntry("smallestReadableFont", []() {
- auto smallFont = qApp->font();
- if (smallFont.pixelSize() != -1) {
- smallFont.setPixelSize(smallFont.pixelSize() - 2);
- } else {
- smallFont.setPointSize(smallFont.pointSize() - 2);
- }
- return smallFont;
- }()));
-
- setDefaultFont(qGuiApp->font());
-}
-
QIcon PlasmaDesktopTheme::iconFromTheme(const QString &name, const QColor
&customColor)
{
#ifndef Q_OS_ANDROID
@@ -366,7 +375,6 @@
bool PlasmaDesktopTheme::event(QEvent *event)
{
if (event->type() ==
Kirigami::PlatformThemeEvents::DataChangedEvent::type) {
- syncFont();
syncColors();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-breeze-style-5.24.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.h
new/qqc2-breeze-style-5.24.1/kirigami-plasmadesktop-integration/plasmadesktoptheme.h
---
old/qqc2-breeze-style-5.24.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.h
2022-02-03 15:47:55.000000000 +0100
+++
new/qqc2-breeze-style-5.24.1/kirigami-plasmadesktop-integration/plasmadesktoptheme.h
2022-02-15 13:46:09.000000000 +0100
@@ -48,9 +48,6 @@
protected:
bool event(QEvent *event) override;
-protected Q_SLOTS:
- void syncFont();
-
private:
friend class StyleSingleton;
QPointer<QWindow> m_window;
