diff options
| author | Marko Kenttala <ext-marko.r.kenttala@nokia.com> | 2012-02-08 15:35:47 +0200 |
|---|---|---|
| committer | Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com> | 2012-02-09 11:08:15 +0100 |
| commit | 26ed6707f3249ac3410643fde32b0698aaf7dcfa (patch) | |
| tree | e0ea0caa7e5fd99b30263632c359fbd7b3795768 | |
| parent | 543b7379316d99035d0bcb32a9341ac572996842 (diff) | |
| download | qt4-tools-26ed6707f3249ac3410643fde32b0698aaf7dcfa.tar.gz | |
Fix Qt to use font with simplified chinese characters as default if needed
Qt defaulted to use a font with traditional chinese characters even if system
language was set as ELangPrcChinese. Fixed qfont_s60 to use a font with
simplified chinese characters in this case.
Task-Number: ou1cimx1#915614
Change-Id: I0258a95f6630b4fa07acc9340bb38fc67bea7b1d
Reviewed-by: Sami Merilä <sami.merila@nokia.com>
Reviewed-by: Murray Read <ext-murray.2.read@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
(cherry picked from commit 0983a18a29903ecac6dc870ffbde519db1b65e20)
| -rw-r--r-- | src/gui/text/qfont_s60.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/text/qfont_s60.cpp b/src/gui/text/qfont_s60.cpp index 76133fa83b..d2a332d4e8 100644 --- a/src/gui/text/qfont_s60.cpp +++ b/src/gui/text/qfont_s60.cpp @@ -62,6 +62,14 @@ static QString classicalSymbianSystemFont() { static QString font; if (font.isEmpty()) { + if (User::Language() == ELangPrcChinese) { + // Use font with simplified Chinese characters as default + QString scfont("MHeiM-C-GB18030-S60"); + if (fontFamiliesOnFontServer()->contains(scfont)) { + font = scfont; + return font; + } + } static const char* const classicSymbianSystemFonts[] = { "Nokia Sans S60", "Series 60 Sans" }; for (int i = 0; i < sizeof classicSymbianSystemFonts / sizeof classicSymbianSystemFonts[0]; ++i) { const QString classicFont = QLatin1String(classicSymbianSystemFonts[i]); |