From e33b0118b402224e75cb7bd6468d719312505b45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Fri, 24 Mar 2017 14:29:03 +0100
Subject: Rename QBasicFontDatabase to QFreeTypeFontDatabase which is what it
 is

Change-Id: I8def2f7ae1e4c8d8a3e1f8e60549da5d691e4fb3
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
---
 src/plugins/platforms/minimal/qminimalintegration.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp
index aa0037f187..820c4891ca 100644
--- a/src/plugins/platforms/minimal/qminimalintegration.cpp
+++ b/src/plugins/platforms/minimal/qminimalintegration.cpp
@@ -44,7 +44,7 @@
 #include <QtGui/private/qguiapplication_p.h>
 #include <qpa/qplatformwindow.h>
 
-#include <QtFontDatabaseSupport/private/qbasicfontdatabase_p.h>
+#include <QtFontDatabaseSupport/private/qfreetypefontdatabase_p.h>
 #if defined(Q_OS_WINRT)
 #  include <QtFontDatabaseSupport/private/qwinrtfontdatabase_p.h>
 #elif defined(Q_OS_WIN)
-- 
cgit v1.2.3


From 2b9ecfe69c01085fbafb6c3c83b7ca4a5f564f8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Thu, 30 Mar 2017 14:35:26 +0200
Subject: macOS: Split out font engine creation from QCoreTextFontDatabase

The Core Text font database can produce both Core Text and FreeType font
engines. Refactor the code a bit so that the actual factory methods that
differ between the two stand out, and do not require a granular runtime
check in each method.

Change-Id: Ib70f76f4a9001a8108d87c1101a50699a6ea8f55
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/plugins/platforms/minimal/qminimalintegration.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp
index 820c4891ca..ca33689cd7 100644
--- a/src/plugins/platforms/minimal/qminimalintegration.cpp
+++ b/src/plugins/platforms/minimal/qminimalintegration.cpp
@@ -69,6 +69,8 @@
 
 QT_BEGIN_NAMESPACE
 
+class QCoreTextFontEngine;
+
 static const char debugBackingStoreEnvironmentVariable[] = "QT_DEBUG_BACKINGSTORE";
 
 static inline unsigned parseOptions(const QStringList &paramList)
@@ -140,7 +142,7 @@ QPlatformFontDatabase *QMinimalIntegration::fontDatabase() const
             m_fontDatabase = new QWindowsFontDatabase;
         }
 #elif defined(Q_OS_DARWIN)
-        m_fontDatabase = new QCoreTextFontDatabase;
+        m_fontDatabase = new QCoreTextFontDatabaseEngineFactory<QCoreTextFontEngine>;
 #else
         m_fontDatabase = QPlatformIntegration::fontDatabase();
 #endif
-- 
cgit v1.2.3