Merge pull request #34526 from ttuegel/bugfix/plasma-integration/font-style
plasma-integration: Fix font style name bug with Qt >= 5.8wip/yesman
commit
4688dd0cf5
@ -0,0 +1,24 @@ |
||||
Index: src/platformtheme/kfontsettingsdata.cpp
|
||||
===================================================================
|
||||
--- src/platformtheme/kfontsettingsdata.cpp
|
||||
+++ src/platformtheme/kfontsettingsdata.cpp
|
||||
@@ -70,15 +70,18 @@
|
||||
const KFontData &fontData = DefaultFontData[fontType];
|
||||
cachedFont = new QFont(QLatin1String(fontData.FontName), fontData.Size, fontData.Weight);
|
||||
cachedFont->setStyleHint(fontData.StyleHint);
|
||||
- cachedFont->setStyleName(QLatin1String(fontData.StyleName));
|
||||
|
||||
const KConfigGroup configGroup(mKdeGlobals, fontData.ConfigGroupKey);
|
||||
QString fontInfo = configGroup.readEntry(fontData.ConfigKey, QString());
|
||||
|
||||
//If we have serialized information for this font, restore it
|
||||
//NOTE: We are not using KConfig directly because we can't call QFont::QFont from here
|
||||
if (!fontInfo.isEmpty()) {
|
||||
cachedFont->fromString(fontInfo);
|
||||
+ } else {
|
||||
+ // set the canonical stylename here, where it cannot override
|
||||
+ // user-specific font attributes if those do not include a stylename.
|
||||
+ cachedFont->setStyleName(QLatin1String(fontData.StyleName));
|
||||
}
|
||||
|
||||
mFonts[fontType] = cachedFont;
|
Loading…
Reference in new issue