From 45bec92e7a91890dbd40d8d5d310d41a617401e4 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Wed, 4 May 2016 16:14:50 +0200
Subject: make qt-freetype use qt-zlib when present

from the perspective of freetype, this looks like a system zlib.

Change-Id: Idb961850b2a92d456cfa2b027bdc85ce5e4be771
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
---
 src/src.pro | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/src.pro')

diff --git a/src/src.pro b/src/src.pro
index 167133859b..8c18c8d524 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -129,7 +129,12 @@ src_plugins.depends = src_sql src_xml src_network
 src_android.subdir = $$PWD/android
 
 # this order is important
-contains(QT_CONFIG, zlib)|cross_compile: SUBDIRS += src_qtzlib
+contains(QT_CONFIG, zlib)|cross_compile {
+    SUBDIRS += src_qtzlib
+    contains(QT_CONFIG, zlib) {
+        src_3rdparty_freetype.depends += src_corelib
+    }
+}
 SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc
 !contains(QT_DISABLED_FEATURES, regularexpression):pcre {
     SUBDIRS += src_3rdparty_pcre
-- 
cgit v1.2.3