From 7a08f714a582b2dd1dbdcbc4c20cebc3d7536fe1 Mon Sep 17 00:00:00 2001
From: Konstantin Ritt <ritt.ks@gmail.com>
Date: Wed, 19 Mar 2014 14:18:43 +0200
Subject: Fix bundled HarfBuzz-NG build on Mac
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I2229c77b4951c2ba9b445286cb94a2a86e345c34
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
---
 src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro   | 8 ++++++++
 src/3rdparty/harfbuzz-ng/src/hb-coretext.h | 8 +++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
index d65520927b..7d997d7d8b 100644
--- a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
+++ b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
@@ -121,6 +121,14 @@ mac {
 
     HEADERS += \
         $$PWD/src/hb-coretext.h
+
+    ios: \
+        # On iOS CoreText and CoreGraphics are stand-alone frameworks
+        LIBS_PRIVATE += -framework CoreText -framework CoreGraphics
+    else: \
+        # On Mac OS they are part of the ApplicationServices umbrella framework,
+        # even in 10.8 where they were also made available stand-alone.
+        LIBS_PRIVATE += -framework ApplicationServices
 }
 
 TARGET = $$TARGET$$qtPlatformTargetSuffix()
diff --git a/src/3rdparty/harfbuzz-ng/src/hb-coretext.h b/src/3rdparty/harfbuzz-ng/src/hb-coretext.h
index bcf1de7141..aa4bf69a52 100644
--- a/src/3rdparty/harfbuzz-ng/src/hb-coretext.h
+++ b/src/3rdparty/harfbuzz-ng/src/hb-coretext.h
@@ -29,7 +29,13 @@
 
 #include "hb.h"
 
-#include <ApplicationServices/ApplicationServices.h>
+#include <TargetConditionals.h>
+#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+#  include <CoreText/CoreText.h>
+#  include <CoreGraphics/CoreGraphics.h>
+#else
+#  include <ApplicationServices/ApplicationServices.h>
+#endif
 
 HB_BEGIN_DECLS
 
-- 
cgit v1.2.3