From fd89fb4566501b3b4a34e25fefa882e97498e3ff Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Wed, 10 Aug 2016 14:50:28 +0200
Subject: Cleanup QT_NO_FONTCONFIG usage

Stop messing around with the define in pro files, and rely on
the configuration system. Disable fontconfig on Mac, which in practice
gives the same result as before.

Change-Id: Iea3aec127af96f221f4ee8682fb20a624332b82f
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 configure.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.json')

diff --git a/configure.json b/configure.json
index 3f007d485d..f3c6f247f9 100644
--- a/configure.json
+++ b/configure.json
@@ -2063,7 +2063,7 @@
         },
         "fontconfig": {
             "description": "Fontconfig",
-            "condition": "!config.win32 && features.system-freetype && libs.fontconfig",
+            "condition": "!config.win32 && !config.darwin && features.system-freetype && libs.fontconfig",
             "output": [ "privateFeature", "feature" ]
         },
         "harfbuzz": {
-- 
cgit v1.2.3