From da1b0d2d6a540e2a824bb0ac4154e0edaaf9ea45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Tue, 31 Mar 2020 12:25:48 +0200
Subject: Move FreeType font engine/database to QtGui
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTBUG-83255
Change-Id: If6be7057d6bd25b34acd99e18658744161985ed0
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/platformsupport/fontdatabases/mac/coretext.pri             | 4 ++++
 src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/platformsupport/fontdatabases/mac')

diff --git a/src/platformsupport/fontdatabases/mac/coretext.pri b/src/platformsupport/fontdatabases/mac/coretext.pri
index 95b9926e65..31470ae583 100644
--- a/src/platformsupport/fontdatabases/mac/coretext.pri
+++ b/src/platformsupport/fontdatabases/mac/coretext.pri
@@ -13,3 +13,7 @@ else: \
     LIBS_PRIVATE += -framework UIKit
 
 CONFIG += watchos_coretext
+
+qtConfig(freetype) {
+    QMAKE_USE_PRIVATE += freetype
+}
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
index 664e532d7c..c0f1bd4d8d 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -57,7 +57,7 @@
 #endif
 #include <QtCore/QtEndian>
 #ifndef QT_NO_FREETYPE
-#include <QtFontDatabaseSupport/private/qfontengine_ft_p.h>
+#include <QtGui/private/qfontengine_ft_p.h>
 #endif
 
 QT_BEGIN_NAMESPACE
-- 
cgit v1.2.3