OSDN Git Service

do not add the last resort font to the pattern when loading font
authorIvailo Monev <xakepa10@gmail.com>
Thu, 17 Nov 2022 18:37:30 +0000 (20:37 +0200)
committerIvailo Monev <xakepa10@gmail.com>
Thu, 17 Nov 2022 18:37:30 +0000 (20:37 +0200)
the default QApplication font is the last resort font

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
src/gui/text/qfontdatabase.cpp

index 2a1132c..28ee9ab 100644 (file)
@@ -430,12 +430,6 @@ static FcPattern *getFcPattern(const QFontPrivate *fp, const QFontDef &request)
     QByteArray cs = defaultFamily.toUtf8();
     FcPatternAddString(pattern, FC_FAMILY, (const FcChar8 *)cs.constData());
 
-    // add QFont::lastResortFamily() to the list, for compatibility with
-    // previous versions
-    defaultFamily = QFont::lastResortFamily();
-    cs = defaultFamily.toUtf8();
-    FcPatternAddString(pattern, FC_FAMILY, (const FcChar8 *)cs.constData());
-
     return pattern;
 }