diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-12-14 00:50:33 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-12-15 12:06:06 +0000 |
| commit | b8189ddd80ff922fe11dfc1eb8bdb6a33eee0dfe (patch) | |
| tree | 7e80638020818580a4b9c993478f8ed8e806cdd7 /src/gui | |
| parent | 674b0e23829395699a3fb4863505f3afbf54a467 (diff) | |
Use the cached font fallback families list in QFont::defaultFamily()
Change-Id: Iba1d9db05f7a09aabb81d0429e6081cd7710d381
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qfont.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 7d9d00713c..947c538234 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -2110,6 +2110,9 @@ QString QFont::lastResortFamily() const return QString::fromLatin1("helvetica"); } +extern QStringList qt_fallbacksForFamily(const QString &family, QFont::Style style, + QFont::StyleHint styleHint, QChar::Script script); + /*! \fn QString QFont::defaultFamily() const @@ -2120,8 +2123,7 @@ QString QFont::lastResortFamily() const */ QString QFont::defaultFamily() const { - QPlatformFontDatabase *fontDB = QGuiApplicationPrivate::platformIntegration()->fontDatabase(); - const QStringList fallbacks = fontDB->fallbacksForFamily(QString(), QFont::StyleNormal + const QStringList fallbacks = qt_fallbacksForFamily(QString(), QFont::StyleNormal , QFont::StyleHint(d->request.styleHint), QChar::Script_Common); if (!fallbacks.isEmpty()) return fallbacks.first(); |