diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-08 15:48:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-08 15:49:18 +0100 |
| commit | dd756011da13b95fdb630a1bbb90234f1e60f415 (patch) | |
| tree | a6259b1e9b6463108796ce912e3d1752e301505f /src/3rdparty/harfbuzz/src/harfbuzz-thai.c | |
| parent | 0c50edbe84914469973a3b10e0170023ccdd66fe (diff) | |
| parent | b6bf2a33f4c33a212da7b58a049b3b5b20b3f327 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
configure.json
mkspecs/win32-icc/qmake.conf
Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f
Diffstat (limited to 'src/3rdparty/harfbuzz/src/harfbuzz-thai.c')
| -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 |