From 206fe0f4ef41aef4f8dcf6ee380f44a251d2f351 Mon Sep 17 00:00:00 2001 From: kleuter Date: Thu, 13 May 2021 00:09:29 +0200 Subject: [PATCH] 5.15: fix for QTBUG-88495 (Fix shaping problems on iOS 14 / macOS 11) --- 5.15.2/qtbase/src/3rdparty/harfbuzz-ng/src/hb-coretext.cc | 2 +- 5.15.2/qtbase/src/3rdparty/harfbuzz-ng/src/hb-coretext.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/5.15.2/qtbase/src/3rdparty/harfbuzz-ng/src/hb-coretext.cc b/5.15.2/qtbase/src/3rdparty/harfbuzz-ng/src/hb-coretext.cc index d64cb7e..11b6dee 100644 --- a/5.15.2/qtbase/src/3rdparty/harfbuzz-ng/src/hb-coretext.cc +++ b/5.15.2/qtbase/src/3rdparty/harfbuzz-ng/src/hb-coretext.cc @@ -1322,7 +1322,7 @@ struct hb_coretext_aat_shaper_face_data_t {}; hb_coretext_aat_shaper_face_data_t * _hb_coretext_aat_shaper_face_data_create (hb_face_t *face) { - static const hb_tag_t tags[] = {HB_CORETEXT_TAG_MORX, HB_CORETEXT_TAG_MORT, HB_CORETEXT_TAG_KERX}; + static const hb_tag_t tags[] = {HB_CORETEXT_TAG_MORX, HB_CORETEXT_TAG_MORT, HB_CORETEXT_TAG_KERX, HB_CORETEXT_TAG_TRAK}; for (unsigned int i = 0; i < ARRAY_LENGTH (tags); i++) { diff --git a/5.15.2/qtbase/src/3rdparty/harfbuzz-ng/src/hb-coretext.h b/5.15.2/qtbase/src/3rdparty/harfbuzz-ng/src/hb-coretext.h index 4b0a6f0..12f7d25 100644 --- a/5.15.2/qtbase/src/3rdparty/harfbuzz-ng/src/hb-coretext.h +++ b/5.15.2/qtbase/src/3rdparty/harfbuzz-ng/src/hb-coretext.h @@ -43,7 +43,7 @@ HB_BEGIN_DECLS #define HB_CORETEXT_TAG_MORT HB_TAG('m','o','r','t') #define HB_CORETEXT_TAG_MORX HB_TAG('m','o','r','x') #define HB_CORETEXT_TAG_KERX HB_TAG('k','e','r','x') - +#define HB_CORETEXT_TAG_TRAK HB_TAG('t','r','a','k') HB_EXTERN hb_face_t * hb_coretext_face_create (CGFontRef cg_font);