diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2020-03-18 05:36:49 +0300 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2020-03-28 13:44:19 +0300 |
| commit | e3d01840656a07f17549864da163b67094c03c0e (patch) | |
| tree | d33ef5d42ec2542a9b22d94b6ca13cc22b382367 /src/gui/text/qtextengine.cpp | |
| parent | 8de62d34321cd827e60b0a7b6e7434070de301ae (diff) | |
Follow bundled Harfbuzz update
as we raised the minimum requirement for harfbuzz to version 2.6.0:
* use new HB_SCRIPT values instead of tags
* get rid of deprecated (and no-more-used) callbacks
* replace deprecated hb_ot_tags_from_script() usage with a more
flexible and up-to-date hb_ot_tags_from_script_and_language()
Change-Id: I0eafdd2d2028c353fa3a93f5868efceccd364a70
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/gui/text/qtextengine.cpp')
| -rw-r--r-- | src/gui/text/qtextengine.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 81fc9db9c7..990dfa2537 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -1665,11 +1665,12 @@ int QTextEngine::shapeTextWithHarfbuzzNG(const QScriptItem &si, bool dontLigate = hasLetterSpacing && !scriptRequiresOpenType; const hb_feature_t features[5] = { - { HB_TAG('k','e','r','n'), !!kerningEnabled, 0, uint(-1) }, - { HB_TAG('l','i','g','a'), !dontLigate, 0, uint(-1) }, - { HB_TAG('c','l','i','g'), !dontLigate, 0, uint(-1) }, - { HB_TAG('d','l','i','g'), !dontLigate, 0, uint(-1) }, - { HB_TAG('h','l','i','g'), !dontLigate, 0, uint(-1) } }; + { HB_TAG('k','e','r','n'), !!kerningEnabled, HB_FEATURE_GLOBAL_START, HB_FEATURE_GLOBAL_END }, + { HB_TAG('l','i','g','a'), false, HB_FEATURE_GLOBAL_START, HB_FEATURE_GLOBAL_END }, + { HB_TAG('c','l','i','g'), false, HB_FEATURE_GLOBAL_START, HB_FEATURE_GLOBAL_END }, + { HB_TAG('d','l','i','g'), false, HB_FEATURE_GLOBAL_START, HB_FEATURE_GLOBAL_END }, + { HB_TAG('h','l','i','g'), false, HB_FEATURE_GLOBAL_START, HB_FEATURE_GLOBAL_END } + }; const int num_features = dontLigate ? 5 : 1; // whitelist cross-platforms shapers only |