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>

1 files changed, 11 insertions, 1 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 9dfcb82151..d48ec8c6f7 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -69,6 +69,9 @@ static void initResources()
 
 QT_BEGIN_NAMESPACE
 
+class QCoreTextFontEngine;
+class QFontEngineFT;
+
 QCocoaScreen::QCocoaScreen(int screenIndex)
     : QPlatformScreen(), m_screenIndex(screenIndex), m_refreshRate(60.0)
 {
@@ -302,7 +305,7 @@ QCocoaIntegration *QCocoaIntegration::mInstance = 0;
 
 QCocoaIntegration::QCocoaIntegration(const QStringList &paramList)
     : mOptions(parseOptions(paramList))
-    , mFontDb(new QCoreTextFontDatabase(mOptions.testFlag(UseFreeTypeFontEngine)))
+    , mFontDb(0)
 #ifndef QT_NO_ACCESSIBILITY
     , mAccessibility(new QCocoaAccessibility)
 #endif
@@ -318,6 +321,13 @@ QCocoaIntegration::QCocoaIntegration(const QStringList &paramList)
         qWarning("Creating multiple Cocoa platform integrations is not supported");
     mInstance = this;
 
+#ifndef QT_NO_FREETYPE
+    if (mOptions.testFlag(UseFreeTypeFontEngine))
+        mFontDb.reset(new QCoreTextFontDatabaseEngineFactory<QFontEngineFT>);
+    else
+#endif
+        mFontDb.reset(new QCoreTextFontDatabaseEngineFactory<QCoreTextFontEngine>);
+
     QString icStr = QPlatformInputContextFactory::requested();
     icStr.isNull() ? mInputContext.reset(new QCocoaInputContext)
                    : mInputContext.reset(QPlatformInputContextFactory::create(icStr));