diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro | 14 | ||||
| -rw-r--r-- | src/platformsupport/fontdatabases/mac/coretext.pri | 14 |
2 files changed, 20 insertions, 8 deletions
diff --git a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro index d135b8a9fd2..0f7d7c2bdab 100644 --- a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro +++ b/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 + } } } diff --git a/src/platformsupport/fontdatabases/mac/coretext.pri b/src/platformsupport/fontdatabases/mac/coretext.pri index aed89ad8c7c..df53f569330 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 + } } |