diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2014-03-25 10:08:05 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-25 14:19:27 +0100 |
| commit | 0b87f4f6c912a508f170cd25ff5317bb77665fa9 (patch) | |
| tree | 1ef3c9764d22ffe8baebdf6a1111b67532fe2055 /src/plugins/platforms/android/qandroidplatformfontdatabase.h | |
| parent | d668f1be22c0e0219c02bcc6928a825ca4f33e42 (diff) | |
Android: Fix font merging
Our fallback fonts would contain a minimal list of hardcoded fallback
fonts, which is neither sufficient for displaying all text, nor
portable to different vendors which can supply different font sets.
[ChangeLog][Android] Fixed font merging problem which caused e.g.
missing glyphs for Arabic numerals.
Task-number: QTBUG-37738
Change-Id: Ic971343a1cd5610c79a81f6f6152c637937b5626
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformfontdatabase.h')
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformfontdatabase.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformfontdatabase.h b/src/plugins/platforms/android/qandroidplatformfontdatabase.h index 3cbfe95d36..cdd3cf1674 100644 --- a/src/plugins/platforms/android/qandroidplatformfontdatabase.h +++ b/src/plugins/platforms/android/qandroidplatformfontdatabase.h @@ -53,6 +53,9 @@ public: QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const; + +private: + QHash<QChar::Script, QStringList> m_fallbacks; }; #endif // QANDROIDPLATFORMFONTDATABASE_H |