diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2014-12-18 07:35:55 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2014-12-23 14:57:33 +0100 |
| commit | a45da5d207431b77a9bfacbc1da1a50712c5d031 (patch) | |
| tree | 5bafbdb6be0a0db95d824d067c0c3bd738bcec02 /src/gui | |
| parent | 32422885fcd10af567b25bdca521fe9e3e68f36f (diff) | |
[QFontDatabasePrivate] Drop unused `fallbackFamilies` member
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>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qfontdatabase.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
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)); |