1 files changed, 23 insertions, 16 deletions

diff --git a/src/3rdparty/harfbuzz-ng/CMakeLists.txt b/src/3rdparty/harfbuzz-ng/CMakeLists.txt
index 709a32f8ba..1fd404ba74 100644
--- a/src/3rdparty/harfbuzz-ng/CMakeLists.txt
+++ b/src/3rdparty/harfbuzz-ng/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from harfbuzz-ng.pro.
-
 #####################################################################
 ## BundledHarfbuzz Generic Library:
 #####################################################################
@@ -7,7 +5,7 @@
 qt_internal_add_3rdparty_library(BundledHarfbuzz
     QMAKE_LIB_NAME harfbuzz
     STATIC
-    SKIP_AUTOMOC # special case
+    SKIP_AUTOMOC
     SOURCES
         hb-dummy.cc
         src/hb.h
@@ -18,7 +16,8 @@ qt_internal_add_3rdparty_library(BundledHarfbuzz
         src/hb-blob.cc src/hb-blob.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-deserialize-text-glyphs.hh
+        src/hb-buffer-deserialize-text-unicode.hh
         src/hb-buffer-serialize.cc
         src/hb-buffer-verify.cc
         src/hb-cache.hh
@@ -27,14 +26,20 @@ qt_internal_add_3rdparty_library(BundledHarfbuzz
         src/hb-deprecated.h
         src/hb-draw.cc src/hb-draw.h src/hb-draw.hh
         src/hb-face.cc src/hb-face.h src/hb-face.hh
+        src/hb-face-builder.cc
         src/hb-fallback-shape.cc
         src/hb-font.cc src/hb-font.h src/hb-font.hh
+        src/hb-ft-colr.hh
+        src/hb-limits.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-outline.cc src/hb-outline.hh
+        src/hb-paint.cc src/hb-paint.h src/hb-paint.hh
+        src/hb-paint-extents.cc src/hb-paint-extents.hh
         src/hb-priority-queue.hh
         src/hb-repacker.hh
         src/hb-set.cc src/hb-set.h src/hb-set.hh
@@ -51,7 +56,10 @@ qt_internal_add_3rdparty_library(BundledHarfbuzz
         src/hb-subset-cff1.cc
         src/hb-subset-cff2.cc
         src/hb-subset-input.cc
+        src/hb-subset-instancer-iup.cc src/hb-subset-instancer-iup.hh
+        src/hb-subset-instancer-solver.cc
         src/hb-subset-plan.cc
+        src/hb-subset-plan-member-list.hh
         src/hb-subset-repacker.cc src/hb-subset-repacker.h
         src/hb-unicode.cc src/hb-unicode.h src/hb-unicode.hh
         src/hb-utf.hh
@@ -64,8 +72,8 @@ qt_internal_add_3rdparty_library(BundledHarfbuzz
         HB_NO_UNICODE_FUNCS
         QT_NO_VERSION_TAGGING
     INCLUDE_DIRECTORIES
-        $<TARGET_PROPERTY:Core,INCLUDE_DIRECTORIES> # special case
-        "${CMAKE_CURRENT_SOURCE_DIR}" # special case
+        $<TARGET_PROPERTY:Core,INCLUDE_DIRECTORIES>
+        "${CMAKE_CURRENT_SOURCE_DIR}"
     PUBLIC_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/harfbuzz>
 )
@@ -80,16 +88,9 @@ endif()
 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:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:harfbuzz-ng.pro:APPLE:
-# SHAPERS = "coretext"
-
 qt_internal_extend_target(BundledHarfbuzz CONDITION UNIX
     DEFINES
         HAVE_PTHREAD
@@ -102,7 +103,7 @@ qt_internal_extend_target(BundledHarfbuzz CONDITION WIN32
         HB_NO_WIN1256
 )
 
-qt_internal_extend_target(BundledHarfbuzz CONDITION TRUE # special case
+qt_internal_extend_target(BundledHarfbuzz CONDITION TRUE
     SOURCES
         src/hb-ot.h
         src/hb-ot-cff1-std-str.hh
@@ -110,8 +111,6 @@ qt_internal_extend_target(BundledHarfbuzz CONDITION TRUE # special case
         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-color-colrv1-closure.hh
         src/hb-ot-face.cc
         src/hb-ot-font.cc src/hb-ot-font.h
         src/hb-ot-glyf-table.hh
@@ -170,6 +169,14 @@ qt_internal_extend_target(BundledHarfbuzz CONDITION TRUE # special case
         src/hb-ot-var-fvar-table.hh
         src/hb-ot-var-hvar-table.hh
         src/hb-ot-var-mvar-table.hh
+        src/OT/Color/CBDT/CBDT.hh
+        src/OT/Color/COLR/COLR.hh
+        src/OT/Color/COLR/colrv1-closure.hh
+        src/OT/Color/CPAL/CPAL.hh
+        src/OT/Color/sbix/sbix.hh
+        src/OT/Color/svg/svg.hh
+        src/OT/Layout/GDEF/GDEF.hh
+        src/OT/name/name.hh
     DEFINES
         HAVE_OT
 )