diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2014-03-19 14:18:43 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-20 19:01:53 +0100 |
commit | 7a08f714a582b2dd1dbdcbc4c20cebc3d7536fe1 (patch) | |
tree | aa9945a171f92bdc2fd67da61b9580b113485f7b | |
parent | 23595107cd2366a86cf968578ddb17b827c7a596 (diff) |
Fix bundled HarfBuzz-NG build on Mac
Change-Id: I2229c77b4951c2ba9b445286cb94a2a86e345c34
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
-rw-r--r-- | src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro | 8 | ||||
-rw-r--r-- | src/3rdparty/harfbuzz-ng/src/hb-coretext.h | 8 |
2 files changed, 15 insertions, 1 deletions
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 |