From 07b555f6bfdcf1a42ff1713c55f59fd10a52eec2 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 16 Jan 2022 15:47:26 +0200 Subject: [PATCH] substitute regular with normal style for compatibility in QFontDatabase::styles() Signed-off-by: Ivailo Monev --- src/gui/text/qfontdatabase.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index dd9d82a60..11fa5d2f6 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -414,7 +414,12 @@ QStringList QFontDatabase::styles(const QString &family) const || (!parsedfoundry.isEmpty() && fontfamily.foundry.compare(parsedfoundry, Qt::CaseInsensitive) != 0)) { continue; } - result.append(fontfamily.style); + // compatibility + if (fontfamily.style.compare(QLatin1String("Regular"), Qt::CaseInsensitive) == 0) { + result.append(QLatin1String("Normal")); + } else { + result.append(fontfamily.style); + } } return result; } -- 2.11.0