Don't disable CoreText on watchOS Simulator (take 2)

Follows up f607233c7c (which originally
introduced this workaround) and 397f345a6a
(which refactored simulator_and_device not to use exclusive builds).

Change-Id: I97f0edefb1bc97167cfa83e4ac0f7581713fb092
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>

src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro

@@ -160,9 +160,15 @@ contains(SHAPERS, coretext) {
     # 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:CONFIG(simulator, simulator|device) {
-        QMAKE_CXXFLAGS += \
-            -F$$xcodeSDKInfo(Path, $${simulator.sdk})/System/Library/Frameworks \
-            -F$$xcodeSDKInfo(Path, $${device.sdk})/System/Library/Frameworks
+    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
+        }
     }
 }

src/platformsupport/fontdatabases/mac/coretext.pri

@@ -19,8 +19,14 @@ else: \
 # 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:CONFIG(simulator, simulator|device) {
-    QMAKE_CXXFLAGS += \
-        -F$$xcodeSDKInfo(Path, $${simulator.sdk})/System/Library/Frameworks \
-        -F$$xcodeSDKInfo(Path, $${device.sdk})/System/Library/Frameworks
+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
+    }
 }