diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2013-03-31 19:12:08 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-01 12:03:55 +0200 |
| commit | 0fcadcca3d0842354de07ffaa8c622e607aab22c (patch) | |
| tree | 4187a5f8e0fa936563ba8b26ad2b202640e48b82 /src/platformsupport/fontdatabases | |
| parent | f0af3ed4e5b3656c9408522d0346b1c75f661135 (diff) | |
QFontConfigDatabase: fix fallbacksForFamily() for CJK languages
For Han Unicode script, the language couldn't be determined algorithmically,
the only way is guessing based on the user's locale.
The is a regression introduced in 9b0fab6b62df98519ebfab117f14b9d3465d8c68
Change-Id: I84645885a825fdfb6c268edaf10185bf5e447eb5
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/platformsupport/fontdatabases')
| -rw-r--r-- | src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp index 288f6ca0e3..6ba71d112e 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp +++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp @@ -134,8 +134,8 @@ static const char *specialLanguages[] = { "mn", // Mongolian "ja", // Hiragana "ja", // Katakana - "zh", // Bopomofo - "zh", // Han + "zh-TW", // Bopomofo + "", // Han "ii", // Yi "ett", // OldItalic "got", // Gothic @@ -697,11 +697,11 @@ QStringList QFontconfigDatabase::fallbacksForFamily(const QString &family, QFont FcPatternAddLangSet(pattern, FC_LANG, ls); FcLangSetDestroy(ls); } else if (!family.isEmpty()) { - // If script is common then it may include languages like CJK, + // If script is Common or Han, then it may include languages like CJK, // we should attach system default language set to the pattern // to obtain correct font fallback list (i.e. if LANG=zh_CN // then we normally want to use a Chinese font for CJK text; - // while a Japanese font should be use for that if LANG=ja) + // while a Japanese font should be used for that if LANG=ja) FcPattern *dummy = FcPatternCreate(); FcDefaultSubstitute(dummy); FcChar8 *lang = 0; |