diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2023-01-25 08:16:27 +0100 |
---|---|---|
committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2023-01-31 08:20:03 +0000 |
commit | bfe080debbe764d341babfa37b471efb07575847 (patch) | |
tree | a760d300e73714cd7636022da52bea3cc833c474 /src/3rdparty/harfbuzz-ng/import_from_tarball.sh | |
parent | da898fca026f629be0ed234f0a89a99bc662385d (diff) |
Update Harfbuzz to version 6.0.0
Note: This requires an update to the tst_qtextlayout test, because
the test assumed that the Arabic string would always yield a run
of two glyphs. This was a side effect of how Harfbuzz handled
Qt's test font, which has zero font tables and cannot be used for
shaping. With the Harfbuzz update, the Arabic text here yields a
single cluster instead, which actually makes more sense, so the
test has been made a bit more robust to support both cases.
Pick-to: 6.2 6.5
Task-number: QTBUG-110338
Change-Id: I93d4cf8e3046dc93224e144d4c81d86bef4918d1
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/3rdparty/harfbuzz-ng/import_from_tarball.sh')
-rw-r--r-- | src/3rdparty/harfbuzz-ng/import_from_tarball.sh | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/3rdparty/harfbuzz-ng/import_from_tarball.sh b/src/3rdparty/harfbuzz-ng/import_from_tarball.sh index 7bcaf22cdc..627cc51b28 100644 --- a/src/3rdparty/harfbuzz-ng/import_from_tarball.sh +++ b/src/3rdparty/harfbuzz-ng/import_from_tarball.sh @@ -90,16 +90,4 @@ for i in ${FILES[*]}; do copy_file_or_dir "$i" done -CODEFILES=($HB_DIR/src/*.cc - $HB_DIR/src/*.hh - $HB_DIR/src/*.h) - -for i in ${CODEFILES[*]}; do - cp $i $TARGET_DIR/src/ -done - -GSUBFILES=($HB_DIR/src/OT/Layout/GSUB/*.hh) - -for i in ${GSUBFILES[*]}; do - cp $i $TARGET_DIR/src/OT/Layout/GSUB/ -done +cp -R $HB_DIR/src $TARGET_DIR |