From 0133b59246a0daf88a0ba284a2cd9f65a5ece353 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Wed, 29 Mar 2017 20:49:08 -0700 Subject: 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 --- src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h') diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h index 3b1be2e6a1..344e235053 100644 --- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h +++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h @@ -57,12 +57,7 @@ #include #include -#ifdef Q_OS_OSX -#include -#else -#include -#include -#endif +Q_FORWARD_DECLARE_CF_TYPE(CTFontDescriptor); Q_DECLARE_METATYPE(QCFType); Q_DECLARE_METATYPE(QCFType); -- cgit v1.2.3