1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Font style name 'Normal' and 'Regular' have the same meaning

Browse Source 
Some popular fonts on linux systems follow a naming convention,
where font styles are named 'Regular', 'Italic', 'Bold' and
'Bold Italic'. Qt so far only accepts the words Italic and Oblique
interchangably, but not with Regular and Normal. This change will
make sure that Regular is interpreted the same as the Normal font
style.

Fixes: QTBUG-90396
Change-Id: Ibbaf086de742c91f4d380c937ca80e846aa32a2e
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 426b363761dbb4c95d263df2e4acdfab071c8018)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Oliver Eftevaag 2021-02-22 19:09:52 +01:00 committed by Qt Cherry-pick Bot
parent 3dca0aaf09
commit f930f6a797
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/widgets/dialogs/qfontdialog.cpp
View File

@ -591,6 +591,14 @@ void QFontDialogPrivate::updateStyles()
cstyle.replace(QLatin1String("Oblique"), QLatin1String("Italic"));
first = false;
goto redo;
} else if (cstyle.contains(QLatin1String("Regular"))) {
cstyle.replace(QLatin1String("Regular"), QLatin1String("Normal"));
first = false;
goto redo;
} else if (cstyle.contains(QLatin1String("Normal"))) {
cstyle.replace(QLatin1String("Normal"), QLatin1String("Regular"));
first = false;
goto redo;
}
}
if (!found)