diff options
Diffstat (limited to 'src/platformsupport/fontdatabases/mac/coretext.pri')
-rw-r--r-- | src/platformsupport/fontdatabases/mac/coretext.pri | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/platformsupport/fontdatabases/mac/coretext.pri b/src/platformsupport/fontdatabases/mac/coretext.pri index aed89ad8c7..df53f56933 100644 --- a/src/platformsupport/fontdatabases/mac/coretext.pri +++ b/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 + } } |