1 files changed, 17 insertions, 18 deletions
diff --git a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
index 3b7b11c8ee..ad40b98753 100644
--- a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
+++ b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
@@ -56,6 +56,8 @@ HEADERS += \
     $$PWD/src/hb-buffer-deserialize-json.hh \
     $$PWD/src/hb-buffer-deserialize-text.hh \
     $$PWD/src/hb-cache-private.hh \
+    $$PWD/src/hb-debug.hh \
+    $$PWD/src/hb-dsalgs.hh \
     $$PWD/src/hb-face-private.hh \
     $$PWD/src/hb-font-private.hh \
     $$PWD/src/hb-mutex-private.hh \
@@ -73,11 +75,13 @@ HEADERS += \
     $$PWD/src/hb-ot-os2-table.hh \
     $$PWD/src/hb-ot-post-table.hh \
     $$PWD/src/hb-private.hh \
+    $$PWD/src/hb-set-digest-private.hh \
     $$PWD/src/hb-set-private.hh \
     $$PWD/src/hb-shape-plan-private.hh \
     $$PWD/src/hb-shaper-impl-private.hh \
     $$PWD/src/hb-shaper-list.hh \
     $$PWD/src/hb-shaper-private.hh \
+    $$PWD/src/hb-string-array.hh \
     $$PWD/src/hb-unicode-private.hh \
     $$PWD/src/hb-utf-private.hh
 
@@ -116,9 +120,11 @@ contains(SHAPERS, opentype) {
         $$PWD/src/hb-ot-shape-complex-use.cc \
         $$PWD/src/hb-ot-shape-complex-use-table.cc \
         $$PWD/src/hb-ot-shape-fallback.cc \
-        $$PWD/src/hb-ot-shape-normalize.cc
+        $$PWD/src/hb-ot-shape-normalize.cc \
+	$$PWD/src/hb-ot-var.cc
 
     HEADERS += \
+        $$PWD/src/hb-ot-kern-table.hh \
         $$PWD/src/hb-ot-layout-common-private.hh \
         $$PWD/src/hb-ot-layout-gdef-table.hh \
         $$PWD/src/hb-ot-layout-gpos-table.hh \
@@ -128,6 +134,8 @@ contains(SHAPERS, opentype) {
         $$PWD/src/hb-ot-layout-math-table.hh \
         $$PWD/src/hb-ot-layout-private.hh \
         $$PWD/src/hb-ot-map-private.hh \
+        $$PWD/src/hb-ot-math-table.hh \
+        $$PWD/src/hb-ot-post-macroman.hh \
         $$PWD/src/hb-ot-shape-complex-arabic-fallback.hh \
         $$PWD/src/hb-ot-shape-complex-arabic-private.hh \
         $$PWD/src/hb-ot-shape-complex-arabic-table.hh \
@@ -140,7 +148,11 @@ contains(SHAPERS, opentype) {
         $$PWD/src/hb-ot-shape-complex-use-private.hh \
         $$PWD/src/hb-ot-shape-fallback-private.hh \
         $$PWD/src/hb-ot-shape-normalize-private.hh \
-        $$PWD/src/hb-ot-shape-private.hh
+        $$PWD/src/hb-ot-shape-private.hh \
+        $$PWD/src/hb-ot-var-avar-table.hh \
+        $$PWD/src/hb-ot-var-fvar-table.hh \
+        $$PWD/src/hb-ot-var-hvar-table.hh \
+        $$PWD/src/hb-ot-var-mvar-table.hh
 
     HEADERS += \
         $$PWD/src/hb-ot.h \
@@ -148,7 +160,8 @@ contains(SHAPERS, opentype) {
         $$PWD/src/hb-ot-layout.h \
         $$PWD/src/hb-ot-math.h \
         $$PWD/src/hb-ot-shape.h \
-        $$PWD/src/hb-ot-tag.h
+        $$PWD/src/hb-ot-tag.h \
+        $$PWD/src/hb-ot-var.h
 }
 
 contains(SHAPERS, coretext) {
@@ -168,21 +181,7 @@ contains(SHAPERS, coretext) {
         # even in 10.8 where they were also made available stand-alone.
         LIBS_PRIVATE += -framework ApplicationServices
 
-    # CoreText is documented to be available on watchOS, but the headers aren't present
-    # in the watchOS Simulator SDK like they are supposed to be. Work around the problem
-    # by adding the device SDK's headers to the search path as a fallback.
-    # rdar://25314492, rdar://27844864
-    watchos:simulator {
-        simulator_system_frameworks = $$xcodeSDKInfo(Path, $${simulator.sdk})/System/Library/Frameworks
-        device_system_frameworks = $$xcodeSDKInfo(Path, $${device.sdk})/System/Library/Frameworks
-        for (arch, QMAKE_APPLE_SIMULATOR_ARCHS) {
-            QMAKE_CXXFLAGS += \
-                -Xarch_$${arch} \
-                -F$$simulator_system_frameworks \
-                -Xarch_$${arch} \
-                -F$$device_system_frameworks
-        }
-    }
+    CONFIG += watchos_coretext
 }
 
 contains(SHAPERS, fallback)|isEmpty(SHAPERS) {