diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2021-03-26 07:44:45 +0100 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2021-04-13 07:42:55 +0000 |
| commit | 910ac477f013f2af690b66f1ac41d65ab7527843 (patch) | |
| tree | 3d0b71b5db5c94faa0c9de2671d7b3c5baef8af1 | |
| parent | 2e8e1f33eefd2ff96a49464964059105a4489427 (diff) | |
Adapt to Harfbuzz 2.8.0 update
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
Pick-to: 6.1 dev
Change-Id: I4e2cfdf61a5c4189b8aac51644c9d80c816aeebc
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -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])); |