diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-31 08:49:01 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-01 08:35:42 +0000 |
| commit | 3cd1c3cb70dd57df939ad067f5668e8304d32237 (patch) | |
| tree | 759f9c14dc4fbfb50bd84a8d8e6815e274e0ed87 /src/3rdparty | |
| parent | 681c15891e723925a876f5d3e8d711b503384285 (diff) | |
Fix libs build with msvc on Chinese locale on Windows
Chinese locale means Code Page 936 here. It's also related with
removing C4819 warnings.
And it's also following Conventions in Qt source code: All code
is ascii only (7-bit characters only, run man ascii if unsure)
See also http://wiki.qt.io/Coding_Conventions
Task-number: QTBUG-56155
Task-number: QTBUG-58161
Change-Id: I37fa7a0e6a82a16eaf80e1cc99be801099ab87de
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: jian liang <jianliang79@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-thai.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c index 2d4627e4f7..fe3296e887 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c @@ -277,7 +277,7 @@ static HB_Bool HB_ThaiConvertStringToGlyphIndices (HB_ShaperItem *item) } } - /* Special case to handle U+0E33 (SARA AM, āļģ): SARA AM is normally written at the end of a + /* Special case to handle U+0E33 (SARA AM): SARA AM is normally written at the end of a * word with a base character and an optional top character before it. For example, U+0E0B * (base), U+0E49 (top), U+0E33 (SARA AM). The sequence should be converted to 4 glyphs: * base, hilo (the little circle in the top left part of SARA AM, NIKHAHIT), top, then the |