1 files changed, 59 insertions, 61 deletions

diff --git a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt
index 23e3689fe0..9da792e15a 100644
--- a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt
+++ b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt
@@ -7,59 +7,50 @@
 qt_add_3rdparty_library(BundledHarfbuzz
     STATIC
     SOURCES
+        hb-dummy.cc
         src/hb.h
-        src/hb-atomic-private.hh
+        src/hb-aat-layout.cc
+        src/hb-aat-map.cc
+        src/hb-algs.hh
+        src/hb-atomic.hh
         src/hb-blob.cc src/hb-blob.h
-        src/hb-buffer.cc src/hb-buffer.h
+        src/hb-buffer.cc src/hb-buffer.h src/hb-buffer.hh
         src/hb-buffer-deserialize-json.hh
         src/hb-buffer-deserialize-text.hh
-        src/hb-buffer-private.hh
         src/hb-buffer-serialize.cc
-        src/hb-cache-private.hh
-        src/hb-common.cc src/hb-common.h
+        src/hb-cache.hh
+        src/hb-common.h
         src/hb-debug.hh
         src/hb-deprecated.h
-        src/hb-dsalgs.hh
-        src/hb-face.cc src/hb-face.h
-        src/hb-face-private.hh
-        src/hb-font.cc src/hb-font.h
-        src/hb-font-private.hh
-        src/hb-mutex-private.hh
-        src/hb-object-private.hh
-        src/hb-open-file-private.hh
-        src/hb-open-type-private.hh
-        src/hb-ot-cbdt-table.hh
-        src/hb-ot-cmap-table.hh
-        src/hb-ot-glyf-table.hh
-        src/hb-ot-head-table.hh
-        src/hb-ot-hhea-table.hh
-        src/hb-ot-hmtx-table.hh
-        src/hb-ot-maxp-table.hh
-        src/hb-ot-name-table.hh
-        src/hb-ot-os2-table.hh
-        src/hb-ot-post-table.hh
-        src/hb-ot-tag.cc
-        src/hb-private.hh
-        src/hb-set.cc src/hb-set.h
-        src/hb-set-digest-private.hh
-        src/hb-set-private.hh
+        src/hb-face.cc src/hb-face.h src/hb-face.hh
+        src/hb-fallback-shape.cc
+        src/hb-font.cc src/hb-font.h src/hb-font.hh
+        src/hb-map.cc
+        src/hb-mutex.hh
+        src/hb-number.cc
+        src/hb-object.hh
+        src/hb-open-file.hh
+        src/hb-open-type.hh
+        src/hb-set.cc src/hb-set.h src/hb-set.hh
+        src/hb-set-digest.hh
         src/hb-shape.cc src/hb-shape.h
-        src/hb-shape-plan.cc src/hb-shape-plan.h
-        src/hb-shape-plan-private.hh
-        src/hb-shaper.cc
-        src/hb-shaper-impl-private.hh
+        src/hb-shape-plan.cc src/hb-shape-plan.h src/hb-shape-plan.hh
+        src/hb-shaper.cc src/hb-shaper.hh
+        src/hb-shaper-impl.hh
         src/hb-shaper-list.hh
-        src/hb-shaper-private.hh
         src/hb-string-array.hh
-        src/hb-unicode.cc src/hb-unicode.h
-        src/hb-unicode-private.hh
-        src/hb-utf-private.hh
+        src/hb-subset.cc
+        src/hb-subset-cff-common.cc
+        src/hb-subset-cff1.cc
+        src/hb-subset-cff2.cc
+        src/hb-subset-input.cc
+        src/hb-subset-plan.cc
+        src/hb-unicode.cc src/hb-unicode.h src/hb-unicode.hh
+        src/hb-utf.hh
         src/hb-version.h
-        src/hb-warning.cc
     DEFINES
         HAVE_ATEXIT
         HAVE_CONFIG_H
-        HB_DISABLE_DEPRECATED
         HB_EXTERN=
         HB_NDEBUG
         HB_NO_UNICODE_FUNCS
@@ -73,6 +64,7 @@ qt_disable_warnings(BundledHarfbuzz)
 qt_set_symbol_visibility_hidden(BundledHarfbuzz)
 
 #### Keys ignored in scope 1:.:.:harfbuzz-ng.pro:<TRUE>:
+# OTHER_FILES = "$$PWD/src/harfbuzz.cc"
 # SHAPERS = "opentype"
 
 ## Scopes:
@@ -108,49 +100,55 @@ qt_extend_target(BundledHarfbuzz CONDITION ANDROID
 qt_extend_target(BundledHarfbuzz CONDITION SHAPERS___contains___opentype
     SOURCES
         src/hb-ot.h
+        src/hb-ot-cff1-table.cc
+        src/hb-ot-cff2-table.cc
+        src/hb-ot-cmap-table.hh
+        src/hb-ot-color.cc
+        src/hb-ot-color-cbdt-table.hh
+        src/hb-ot-face.cc
         src/hb-ot-font.cc src/hb-ot-font.h
+        src/hb-ot-glyf-table.hh
+        src/hb-ot-head-table.hh
+        src/hb-ot-hhea-table.hh
+        src/hb-ot-hmtx-table.hh
         src/hb-ot-kern-table.hh
-        src/hb-ot-layout.cc src/hb-ot-layout.h
-        src/hb-ot-layout-common-private.hh
+        src/hb-ot-layout.cc src/hb-ot-layout.h src/hb-ot-layout.hh
         src/hb-ot-layout-gdef-table.hh
         src/hb-ot-layout-gpos-table.hh
         src/hb-ot-layout-gsub-table.hh
-        src/hb-ot-layout-gsubgpos-private.hh
         src/hb-ot-layout-jstf-table.hh
-        src/hb-ot-layout-math-table.hh
-        src/hb-ot-layout-private.hh
-        src/hb-ot-map.cc
-        src/hb-ot-map-private.hh
+        src/hb-ot-map.cc src/hb-ot-map.hh
         src/hb-ot-math.cc src/hb-ot-math.h
         src/hb-ot-math-table.hh
+        src/hb-ot-maxp-table.hh
+        src/hb-ot-meta.cc
+        src/hb-ot-metrics.cc
+        src/hb-ot-name.cc
+        src/hb-ot-name-table.hh
+        src/hb-ot-os2-table.hh
         src/hb-ot-post-macroman.hh
-        src/hb-ot-shape.cc src/hb-ot-shape.h
-        src/hb-ot-shape-complex-arabic.cc
+        src/hb-ot-post-table.hh
+        src/hb-ot-shape.cc src/hb-ot-shape.h src/hb-ot-shape.hh
+        src/hb-ot-shape-complex-arabic.cc src/hb-ot-shape-complex-arabic.hh
         src/hb-ot-shape-complex-arabic-fallback.hh
-        src/hb-ot-shape-complex-arabic-private.hh
         src/hb-ot-shape-complex-arabic-table.hh
         src/hb-ot-shape-complex-default.cc
         src/hb-ot-shape-complex-hangul.cc
         src/hb-ot-shape-complex-hebrew.cc
-        src/hb-ot-shape-complex-indic.cc
+        src/hb-ot-shape-complex-indic.cc src/hb-ot-shape-complex-indic.hh
         src/hb-ot-shape-complex-indic-machine.hh
-        src/hb-ot-shape-complex-indic-private.hh
         src/hb-ot-shape-complex-indic-table.cc
+        src/hb-ot-shape-complex-khmer.cc
         src/hb-ot-shape-complex-myanmar.cc
         src/hb-ot-shape-complex-myanmar-machine.hh
-        src/hb-ot-shape-complex-private.hh
         src/hb-ot-shape-complex-thai.cc
-        src/hb-ot-shape-complex-tibetan.cc
-        src/hb-ot-shape-complex-use.cc
+        src/hb-ot-shape-complex-use.cc src/hb-ot-shape-complex-use.hh
         src/hb-ot-shape-complex-use-machine.hh
-        src/hb-ot-shape-complex-use-private.hh
         src/hb-ot-shape-complex-use-table.cc
-        src/hb-ot-shape-fallback.cc
-        src/hb-ot-shape-fallback-private.hh
-        src/hb-ot-shape-normalize.cc
-        src/hb-ot-shape-normalize-private.hh
-        src/hb-ot-shape-private.hh
-        src/hb-ot-tag.h
+        src/hb-ot-shape-complex-vowel-constraints.cc
+        src/hb-ot-shape-fallback.cc src/hb-ot-shape-fallback.hh
+        src/hb-ot-shape-normalize.cc src/hb-ot-shape-normalize.hh
+        src/hb-ot-tag.cc
         src/hb-ot-var.cc src/hb-ot-var.h
         src/hb-ot-var-avar-table.hh
         src/hb-ot-var-fvar-table.hh