diff options
| author | Jesus Fernandez <jesus.fernandez@qt.io> | 2018-01-04 20:15:10 +0100 |
|---|---|---|
| committer | Jesus Fernandez <Jesus.Fernandez@qt.io> | 2018-01-09 14:05:59 +0000 |
| commit | 98991b4f9657b56e631400f976131199b90bb877 (patch) | |
| tree | 02044e4eda506b2464caea065a1b8d770cf22664 | |
| parent | 3893920bdb1942390721b259bae297b7711f4bcf (diff) | |
Instantiate QCoreTextFontDatabaseEngineFactory, not just base class
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>
| -rw-r--r-- | src/plugins/platforms/webgl/qwebglintegration_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
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 |