1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt to Harfbuzz 2.8.0 update

Browse Source 
The Unicode 13 language tags are available since Harfbuzz
2.6.7.

For compilation with earlier versions, also update the
hardcoded tags to match the ones in Harfbuzz (and in
iso-15924):

https://unicode.org/iso15924/iso15924-codes.html

Task-number: QTBUG-90217
Change-Id: I4e2cfdf61a5c4189b8aac51644c9d80c816aeebc
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 910ac477f013f2af690b66f1ac41d65ab7527843)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2021-03-26 07:44:45 +01:00 committed by Qt Cherry-pick Bot
parent abe4e3d2fb
commit 6b32d4d18d
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/text/qharfbuzzng.cpp
View File

@ -232,11 +232,18 @@ static const hb_script_t _qtscript_to_hbscript[] = {
HB_SCRIPT_NYIAKENG_PUACHUE_HMONG,
HB_SCRIPT_WANCHO,
// Unicode 13.0 additions (not present in harfbuzz-ng 2.6.4)
hb_script_t(HB_TAG('C', 'h', 'o', 'r')), // Script_Chorasmian
hb_script_t(HB_TAG('D', 'i', 'v', 'e')), // Script_DivesAkuru
hb_script_t(HB_TAG('K', 'h', 'i', 't')), // Script_KhitanSmallScript
// Unicode 13.0 additions (not present in harfbuzz-ng 2.6.6 and earlier)
#if !HB_VERSION_ATLEAST(2, 6, 7)
hb_script_t(HB_TAG('C', 'h', 'r', 's')), // Script_Chorasmian
hb_script_t(HB_TAG('D', 'i', 'a', 'k')), // Script_DivesAkuru
hb_script_t(HB_TAG('K', 'i', 't', 's')), // Script_KhitanSmallScript
hb_script_t(HB_TAG('Y', 'e', 'z', 'i')), // Script_Yezidi
#else
HB_SCRIPT_CHORASMIAN,
HB_SCRIPT_DIVES_AKURU,
HB_SCRIPT_KHITAN_SMALL_SCRIPT,
HB_SCRIPT_YEZIDI
#endif
};
static_assert(QChar::ScriptCount == sizeof(_qtscript_to_hbscript) / sizeof(_qtscript_to_hbscript[0]));