From 98991b4f9657b56e631400f976131199b90bb877 Mon Sep 17 00:00:00 2001
From: Jesus Fernandez <jesus.fernandez@qt.io>
Date: Thu, 4 Jan 2018 20:15:10 +0100
Subject: Instantiate QCoreTextFontDatabaseEngineFactory, not just base class
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We were instantiating the QCoreTextFontDatabase base class, which
doesn't provide the full set of required functions.

Task-number: QTBUG-65078
Change-Id: I4dbe50b594ca25c61f748170acf29fcaabc65c0b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/plugins/platforms/webgl/qwebglintegration_p.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/platforms/webgl/qwebglintegration_p.h b/src/plugins/platforms/webgl/qwebglintegration_p.h
index 2bd4d9d..06f19fc 100644
--- a/src/plugins/platforms/webgl/qwebglintegration_p.h
+++ b/src/plugins/platforms/webgl/qwebglintegration_p.h
@@ -43,6 +43,7 @@
 #include <QtFontDatabaseSupport/private/qwindowsfontdatabase_p.h>
 #include <QtEventDispatcherSupport/private/qwindowsguieventdispatcher_p.h>
 #elif defined(Q_OS_MACOS)
+#include <QtFontDatabaseSupport/private/qfontengine_coretext_p.h>
 #include <QtFontDatabaseSupport/private/qcoretextfontdatabase_p.h>
 #include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
 #else
@@ -73,7 +74,7 @@ public:
 #if defined(Q_OS_WIN)
     mutable QWindowsFontDatabase fontDatabase;
 #elif defined(Q_OS_MACOS)
-    mutable QCoreTextFontDatabase fontDatabase;
+    mutable QCoreTextFontDatabaseEngineFactory<QCoreTextFontEngine> fontDatabase;
 #else
     mutable QGenericUnixFontDatabase fontDatabase;
 #endif
-- 
cgit v1.2.3