diff options
| author | Ahmad Samir <a.samirh78@gmail.com> | 2020-03-03 20:42:51 +0200 |
|---|---|---|
| committer | Ahmad Samir <a.samirh78@gmail.com> | 2020-03-23 06:20:49 +0200 |
| commit | ec9522ae73ffa4e0ff750c52b412f4d6ad020590 (patch) | |
| tree | 974df9fd617e039901a55fdc86b454beeaeaabc1 | |
| parent | 43d4f1276b3afe259907add9b458f15252514fa4 (diff) | |
| download | kconfig-ec9522ae73ffa4e0ff750c52b412f4d6ad020590.tar.gz kconfig-ec9522ae73ffa4e0ff750c52b412f4d6ad020590.tar.bz2 | |
[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
| -rw-r--r-- | src/gui/kconfiggroupgui.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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); |