From ec9522ae73ffa4e0ff750c52b412f4d6ad020590 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Tue, 3 Mar 2020 20:42:51 +0200 Subject: [KConfigGui] Check font weight when clearing styleName property Summary: This is an addendum for commit a2774ff5b41987c3919a9e; making the check tighter. Test Plan: make && ctest Reviewers: #frameworks, dfaure, davidedmundson, cfeck, ervin, meven, bport Reviewed By: dfaure Subscribers: kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D27811 --- src/gui/kconfiggroupgui.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/gui/kconfiggroupgui.cpp') diff --git a/src/gui/kconfiggroupgui.cpp b/src/gui/kconfiggroupgui.cpp index 358e84e4..1ffd249c 100644 --- a/src/gui/kconfiggroupgui.cpp +++ b/src/gui/kconfiggroupgui.cpp @@ -161,10 +161,11 @@ static bool writeEntryGui(KConfigGroup *cg, const char *key, const QVariant &pro // than the former. For more details see: // https://bugreports.qt.io/browse/QTBUG-63792 // https://bugs.kde.org/show_bug.cgi?id=378523 - if (f.styleName() == QLatin1String("Regular") + if (f.weight() == QFont::Normal + && (f.styleName() == QLatin1String("Regular") || f.styleName() == QLatin1String("Normal") || f.styleName() == QLatin1String("Book") - || f.styleName() == QLatin1String("Roman")) { + || f.styleName() == QLatin1String("Roman"))) { f.setStyleName(QString()); } cg->writeEntry(key, f.toString().toUtf8(), pFlags); -- cgit v1.2.1