diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-02-11 17:31:12 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-12 17:43:24 +0100 |
| commit | 74f9664f950e9ea4f385cd70f822e10d7be1aca3 (patch) | |
| tree | fe7fc0811b621947df15c2410b7fad288981db69 /src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h | |
| parent | 183e04a43996f7c4734ab97f20da6ba852dce918 (diff) | |
Use CTFontCopyDefaultCascadeListForLanguages for font fallback if available
On Mac OS 10.8 and iOS 6.0 we can use CTFontCopyDefaultCascadeListForLanguages
to get the list of fallback fonts, which is preferable to reading the plist
file from the filesystem. The latter doesn't work (is not allowed) on iOS
in any case, so for iOS < 6.0 we use a static list of fallback fonts.
Change-Id: Ibb5e1b4dedd6bfb936f66b53a20f7ced83536ed7
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h')
| -rw-r--r-- | src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h index e4d45ab57a..5b9b8e2329 100644 --- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h +++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h @@ -64,7 +64,8 @@ public: private: mutable QString defaultFontName; - QHash<QFont::StyleHint, QStringList> fallbackLists; + mutable QHash<QString, QString> psNameToFamily; + mutable QHash<QString, QString> familyNameToPsName; }; QT_END_NAMESPACE |