Move CoreText font engine/database to QtGui

Task-number: QTBUG-83255
Change-Id: Id34ed1759fdebbb1d09e51009f0370736002167c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

13 files changed, 16 insertions, 16 deletions

diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt
index 14244a6dac..ce4c245a17 100644
--- a/src/plugins/platforms/cocoa/CMakeLists.txt
+++ b/src/plugins/platforms/cocoa/CMakeLists.txt
@@ -58,7 +58,6 @@ qt_internal_add_plugin(QCocoaIntegrationPlugin
         Cups::Cups
         Qt::Core
         Qt::CorePrivate
-        Qt::FontDatabaseSupportPrivate
         Qt::Gui
         Qt::GuiPrivate
         Qt::ThemeSupportPrivate
diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro
index be75cf3f51..9bd95bbceb 100644
--- a/src/plugins/platforms/cocoa/cocoa.pro
+++ b/src/plugins/platforms/cocoa/cocoa.pro
@@ -96,8 +96,7 @@ DEFINES += QT_NO_FOREACH
 
 QT += \
     core-private gui-private \
-    theme_support-private \
-    fontdatabase_support-private
+    theme_support-private
 
 qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private
 
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h
index 30838ba254..2fb16faca5 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.h
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.h
@@ -57,7 +57,7 @@
 
 #include <QtCore/QScopedPointer>
 #include <qpa/qplatformintegration.h>
-#include <QtFontDatabaseSupport/private/qcoretextfontdatabase_p.h>
+#include <QtGui/private/qcoretextfontdatabase_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 2d19809435..27e0bb5f30 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -66,7 +66,7 @@
 
 #include <QtGui/private/qcoregraphics_p.h>
 
-#include <QtFontDatabaseSupport/private/qfontengine_coretext_p.h>
+#include <QtGui/private/qfontengine_coretext_p.h>
 
 #if QT_CONFIG(opengl)
 #include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h>
diff --git a/src/plugins/platforms/cocoa/qcocoatheme.mm b/src/plugins/platforms/cocoa/qcocoatheme.mm
index d73b028afb..543348c7b6 100644
--- a/src/plugins/platforms/cocoa/qcocoatheme.mm
+++ b/src/plugins/platforms/cocoa/qcocoatheme.mm
@@ -56,8 +56,8 @@
 #include <QtGui/private/qcoregraphics_p.h>
 #include <QtGui/qpainter.h>
 #include <QtGui/qtextformat.h>
-#include <QtFontDatabaseSupport/private/qcoretextfontdatabase_p.h>
-#include <QtFontDatabaseSupport/private/qfontengine_coretext_p.h>
+#include <QtGui/private/qcoretextfontdatabase_p.h>
+#include <QtGui/private/qfontengine_coretext_p.h>
 #include <QtThemeSupport/private/qabstractfileiconengine_p.h>
 #include <qpa/qplatformdialoghelper.h>
 #include <qpa/qplatformintegration.h>
diff --git a/src/plugins/platforms/ios/CMakeLists.txt b/src/plugins/platforms/ios/CMakeLists.txt
index 3e41e7e9c7..e7925b5282 100644
--- a/src/plugins/platforms/ios/CMakeLists.txt
+++ b/src/plugins/platforms/ios/CMakeLists.txt
@@ -33,7 +33,6 @@ add_qt_plugin(QIOSIntegrationPlugin
         ${FWUIKit}
         Qt::Core
         Qt::CorePrivate
-        Qt::FontDatabaseSupportPrivate
         Qt::Gui
         Qt::GuiPrivate
 )
diff --git a/src/plugins/platforms/ios/kernel.pro b/src/plugins/platforms/ios/kernel.pro
index 54c46208d8..859fa6e079 100644
--- a/src/plugins/platforms/ios/kernel.pro
+++ b/src/plugins/platforms/ios/kernel.pro
@@ -6,8 +6,7 @@ TARGET = qios
 qtConfig(shared): CONFIG += static
 
 QT += \
-    core-private gui-private \
-    fontdatabase_support-private
+    core-private gui-private
 
 qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private
 
diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm
index e9046151f5..3b01342b8e 100644
--- a/src/plugins/platforms/ios/qiosintegration.mm
+++ b/src/plugins/platforms/ios/qiosintegration.mm
@@ -59,7 +59,7 @@
 #include <qoffscreensurface.h>
 #include <qpa/qplatformoffscreensurface.h>
 
-#include <QtFontDatabaseSupport/private/qcoretextfontdatabase_p.h>
+#include <QtGui/private/qcoretextfontdatabase_p.h>
 #include <QtGui/private/qmacmime_p.h>
 #include <QDir>
 #include <QOperatingSystemVersion>
diff --git a/src/plugins/platforms/ios/qiostheme.mm b/src/plugins/platforms/ios/qiostheme.mm
index 626fbb66fe..1360af9d76 100644
--- a/src/plugins/platforms/ios/qiostheme.mm
+++ b/src/plugins/platforms/ios/qiostheme.mm
@@ -46,7 +46,7 @@
 #include <QtGui/QFont>
 #include <QtGui/private/qcoregraphics_p.h>
 
-#include <QtFontDatabaseSupport/private/qcoretextfontdatabase_p.h>
+#include <QtGui/private/qcoretextfontdatabase_p.h>
 #include <QtGui/private/qguiapplication_p.h>
 #include <qpa/qplatformintegration.h>
 
diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
index a1a2da547b..eaa5deb721 100644
--- a/src/plugins/platforms/minimal/minimal.pro
+++ b/src/plugins/platforms/minimal/minimal.pro
@@ -2,7 +2,9 @@ TARGET = qminimal
 
 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/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp
index b1f07f0ac2..bfdcda1a84 100644
--- a/src/plugins/platforms/minimal/qminimalintegration.cpp
+++ b/src/plugins/platforms/minimal/qminimalintegration.cpp
@@ -54,7 +54,7 @@
 #    include <QtFontDatabaseSupport/private/qwindowsfontdatabase_ft_p.h>
 #  endif
 #elif defined(Q_OS_DARWIN)
-#  include <QtFontDatabaseSupport/private/qcoretextfontdatabase_p.h>
+#  include <QtGui/private/qcoretextfontdatabase_p.h>
 #endif
 
 #if QT_CONFIG(fontconfig)
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