From 426b363761dbb4c95d263df2e4acdfab071c8018 Mon Sep 17 00:00:00 2001 From: Oliver Eftevaag Date: Mon, 22 Feb 2021 19:09:52 +0100 Subject: [PATCH] Font style name 'Normal' and 'Regular' have the same meaning 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 Pick-to: 6.0 6.1 5.15 Change-Id: Ibbaf086de742c91f4d380c937ca80e846aa32a2e Reviewed-by: Volker Hilsheimer --- src/widgets/dialogs/qfontdialog.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp index 3a835641dfd..fb8a8678bfd 100644 --- a/src/widgets/dialogs/qfontdialog.cpp +++ b/src/widgets/dialogs/qfontdialog.cpp @@ -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)