From ce2bc0e2d5b1d647db1e1726ecd434cc8a55accf 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:59 +0200
Subject: Move CoreText font engine/database to QtGui

Task-number: QTBUG-83255
Change-Id: Id34ed1759fdebbb1d09e51009f0370736002167c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/plugins/platforms/offscreen/offscreen.pro             | 4 +++-
 src/plugins/platforms/offscreen/qoffscreenintegration.cpp | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/plugins/platforms/offscreen')

diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro
index f226132592..d44caf536c 100644
--- a/src/plugins/platforms/offscreen/offscreen.pro
+++ b/src/plugins/platforms/offscreen/offscreen.pro
@@ -2,7 +2,9 @@ TARGET = qoffscreen
 
 QT += \
     core-private gui-private \
-    eventdispatcher_support-private fontdatabase_support-private
+    eventdispatcher_support-private
+
+!darwin: QT += fontdatabase_support-private
 
 DEFINES += QT_NO_FOREACH
 
diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp
index 4a27bc511d..1d9a6ee2f7 100644
--- a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp
+++ b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp
@@ -45,7 +45,7 @@
 #include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
 #if defined(Q_OS_MAC)
 #include <qpa/qplatformfontdatabase.h>
-#include <QtFontDatabaseSupport/private/qcoretextfontdatabase_p.h>
+#include <QtGui/private/qcoretextfontdatabase_p.h>
 #else
 #include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
 #endif
-- 
cgit v1.2.3