AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge integration refs/builds/qtci/dev/1618310175

Browse Source
This commit is contained in:
Qt CI Bot 2021-04-13 12:50:59 +00:00
commit 385e242ba9
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]));