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

[QFontDatabasePrivate] Drop unused fallbackFamilies member

Browse Source 
It is probably a refactoring left-over.

Change-Id: Ic6f1e1a87c8603f600cd1736cf12c03ef0188074
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
This commit is contained in:
Konstantin Ritt 2014-12-18 07:35:55 +04:00
parent 32422885fc
commit a45da5d207
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/text/qfontdatabase.cpp
View File

@ -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));