diff options
| author | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2022-10-04 13:57:44 +0200 |
|---|---|---|
| committer | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2022-10-11 14:10:59 +0000 |
| commit | c4e550703c2bdc1ee710507b8df9c0c9a118402e (patch) | |
| tree | c9e045d063f7f52ed36c5162f2246bb866d07b0d /src/gui/text | |
| parent | 20144aab0b6dd740bc45a873526e17af49a41767 (diff) | |
Update UCD to Revision 30
This corresponds to Unicode version 15.0.0.
Added the following scripts:
* Kawi
* Nag Mundari
Full support of these scripts requires harfbuzz version 5.2.0,
this version adds support for Unicode 15.0:
https://github.com/harfbuzz/harfbuzz/releases/tag/5.2.0
Fixes: QTBUG-106810
Change-Id: Ib06c526e49b0f01ef9f21123bcf875c6b19f2601
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qharfbuzzng.cpp | 8 | ||||
| -rw-r--r-- | src/gui/text/unix/qfontconfigdatabase.cpp | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/gui/text/qharfbuzzng.cpp b/src/gui/text/qharfbuzzng.cpp index 875cf28b99..5db6f78319 100644 --- a/src/gui/text/qharfbuzzng.cpp +++ b/src/gui/text/qharfbuzzng.cpp @@ -222,6 +222,14 @@ static const hb_script_t _qtscript_to_hbscript[] = { HB_SCRIPT_TOTO, HB_SCRIPT_VITHKUQI, #endif + // Unicode 15.0 additions (not present in harfbuzz-ng 5.1.0 and earlier) +#if !HB_VERSION_ATLEAST(5, 2, 0) + hb_script_t(HB_TAG('K','a','w','i')), // Script_Kawi + hb_script_t(HB_TAG('N','a','g','m')), // Script_NagMundari +#else + HB_SCRIPT_KAWI, + HB_SCRIPT_NAG_MUNDARI, +#endif }; static_assert(QChar::ScriptCount == sizeof(_qtscript_to_hbscript) / sizeof(_qtscript_to_hbscript[0])); diff --git a/src/gui/text/unix/qfontconfigdatabase.cpp b/src/gui/text/unix/qfontconfigdatabase.cpp index 9b60cf2963..474644b871 100644 --- a/src/gui/text/unix/qfontconfigdatabase.cpp +++ b/src/gui/text/unix/qfontconfigdatabase.cpp @@ -246,6 +246,8 @@ static const char specialLanguages[][6] = { "", // Tangsa "", // Toto "", // Vithkuqi + "", // Kawi + "", // NagMundari }; static_assert(sizeof specialLanguages / sizeof *specialLanguages == QChar::ScriptCount); |