1 files changed, 17 insertions, 1 deletions
diff --git a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
index 4ba2ee3ec4..0f7d7c2bda 100644
--- a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
+++ b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
@@ -13,7 +13,7 @@ load(qt_helper_lib)
 SHAPERS += opentype       # HB's main shaper; enabling it should be enough most of the time
 
 # native shaper on Apple platforms; could be used alone to handle both OT and AAT fonts
-darwin:!if(watchos:CONFIG(simulator, simulator|device)): SHAPERS += coretext
+darwin: SHAPERS += coretext
 
 DEFINES += HAVE_CONFIG_H
 DEFINES += HB_NO_UNICODE_FUNCS HB_DISABLE_DEPRECATED
@@ -155,4 +155,20 @@ contains(SHAPERS, coretext) {
         # On Mac OS they are part of the ApplicationServices umbrella framework,
         # 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
+        }
+    }
 }