From a45da5d207431b77a9bfacbc1da1a50712c5d031 Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Thu, 18 Dec 2014 07:35:55 +0400 Subject: [QFontDatabasePrivate] Drop unused `fallbackFamilies` member It is probably a refactoring left-over. Change-Id: Ic6f1e1a87c8603f600cd1736cf12c03ef0188074 Reviewed-by: Friedemann Kleint Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/gui/text/qfontdatabase.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/gui/text') diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index 89d2272828..e40d134a44 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -458,8 +458,6 @@ public: bool isApplicationFont(const QString &fileName); void invalidate(); - - QStringList fallbackFamilies; }; void QFontDatabasePrivate::invalidate() @@ -881,10 +879,8 @@ QFontEngine *loadEngine(int script, const QFontDef &request, } QStringList fallbacks = request.fallBackFamilies; - if (family && !family->fallbackFamilies.isEmpty()) + if (family) fallbacks += family->fallbackFamilies; - else - fallbacks += privateDb()->fallbackFamilies; QPlatformFontDatabase *pfdb = QGuiApplicationPrivate::platformIntegration()->fontDatabase(); QFontEngineMulti *pfMultiEngine = pfdb->fontEngineMulti(engine, QChar::Script(script)); -- cgit v1.2.3