diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-14 10:35:51 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-14 10:35:51 +0200 |
| commit | 7c495cfea96e13dbd8b4f9bfa2fc8ee5d015597f (patch) | |
| tree | e64c56e73d11c1f0640b280a60c556e0aec557a4 /src/gui/text/qfontdatabase.h | |
| parent | 607462019a1da6241d3f4b6bf6356b7dc0a413d0 (diff) | |
| parent | b61ee210e67e5575bc96489908b9c46f7b74ec7a (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
src/gui/text/qfontengine_qpf2.cpp
Change-Id: Ib04f92c41d0edd55d3aef8fb1708d917fba0f2a8
Diffstat (limited to 'src/gui/text/qfontdatabase.h')
| -rw-r--r-- | src/gui/text/qfontdatabase.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontdatabase.h b/src/gui/text/qfontdatabase.h index 5be24dc3fe..245d1cf81b 100644 --- a/src/gui/text/qfontdatabase.h +++ b/src/gui/text/qfontdatabase.h @@ -160,7 +160,7 @@ private: static void createDatabase(); static void parseFontName(const QString &name, QString &foundry, QString &family); static QString resolveFontFamilyAlias(const QString &family); - static QFontEngine *findFont(int script, const QFontPrivate *fp, const QFontDef &request, bool multi = false); + static QFontEngine *findFont(int script, const QFontPrivate *fp, const QFontDef &request, bool multi = false, bool fallback = false); static void load(const QFontPrivate *d, int script); friend struct QFontDef; |