diff options
author | Jake Petroules <jake.petroules@qt.io> | 2017-03-29 20:49:08 -0700 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2017-03-30 22:54:31 +0000 |
commit | 0133b59246a0daf88a0ba284a2cd9f65a5ece353 (patch) | |
tree | 2a316c272855421480a267a73651f499032e71dc /src/3rdparty | |
parent | 0c8b5446d42b27b601ff369a8f93c4875feba2a5 (diff) |
Fix CoreText font database build on watchOS
The font database uses UIKit symbols on all UIKit platforms and thus it
must be linked to. Also, limit the missing CoreText.h workaround so
that it is not applied for versions of Xcode where the bug is fixed.
Change-Id: Ia2a94baba6b0df618604a0bc3092fbd2a48d5aea
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro index 3b7b11c8ee..e5746bf3eb 100644 --- a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro +++ b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro @@ -168,21 +168,7 @@ contains(SHAPERS, coretext) { # 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 - } - } + CONFIG += watchos_coretext } contains(SHAPERS, fallback)|isEmpty(SHAPERS) { |