diff options
author | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-04-13 12:50:59 +0000 |
---|---|---|
committer | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-04-13 12:50:59 +0000 |
commit | 385e242ba987bfd611daa21ea981ad4963822b8c (patch) | |
tree | 53e3c04ecb08bf8a0b3ef32ade0380f01bc0403c /src/gui | |
parent | 2c5a35f6ed2ff25074c0f20dacec827ccc428fd4 (diff) | |
parent | cd9bbcd97abe474cd001dadf86920febba7ef70e (diff) |
Merge integration refs/builds/qtci/dev/1618310175
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/text/qharfbuzzng.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/gui/text/qharfbuzzng.cpp b/src/gui/text/qharfbuzzng.cpp index b4b67adc3e..66d5def056 100644 --- a/src/gui/text/qharfbuzzng.cpp +++ b/src/gui/text/qharfbuzzng.cpp @@ -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])); |