diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-09-29 20:04:19 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-11-03 11:46:40 +0000 |
| commit | 36d3f24d6aebf9d4f56d42eb7702fc40c7406e29 (patch) | |
| tree | d4454b5d5541cdfad5d334b5b639ef556f60d141 /src/platformsupport | |
| parent | b3d871554c8cca274db423a81a20c3fbf8c6a899 (diff) | |
Don't disable CoreText on watchOS Simulator (take 2)
Follows up f607233c7ce899c27034eca01c23b0da2895bf93 (which originally
introduced this workaround) and 397f345a6a2c69c8f15f5d2f21989c303aca586e
(which refactored simulator_and_device not to use exclusive builds).
Change-Id: I97f0edefb1bc97167cfa83e4ac0f7581713fb092
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/platformsupport')
| -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 + } } |