diff options
| author | R.J.V. Bertin <rjvbertin@gmail.com> | 2018-12-05 18:47:47 +0100 |
|---|---|---|
| committer | René J.V. Bertin <rjvbertin@gmail.com> | 2018-12-13 09:32:45 +0000 |
| commit | b2aa8dbbde11815080d12837acf0be2bb36471bf (patch) | |
| tree | c88f7ab221114d57488986ed5a754c6598f46682 /src/plugins/platforms/offscreen/qoffscreenintegration.cpp | |
| parent | 730dea58cfb2881e67e409b9ad0677485e2b3eb1 (diff) | |
Offscreen QPA: use a CoreText font database on macOS
Without this applications using the Offscreen QPA don't have
access to any fonts on macOS and thus cannot render text correctly.
Task-number: QTBUG-72335
Change-Id: I8e58c066365d0231d0993ad3b480d957a32f7f7b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 6b52c1834daec628bab5a384e1dfd039937b375d)
Diffstat (limited to 'src/plugins/platforms/offscreen/qoffscreenintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/offscreen/qoffscreenintegration.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp index 0c39950019..9fbb266f63 100644 --- a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp +++ b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp @@ -45,6 +45,7 @@ #include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h> #if defined(Q_OS_MAC) #include <qpa/qplatformfontdatabase.h> +#include <QtFontDatabaseSupport/private/qcoretextfontdatabase_p.h> #else #include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> #endif @@ -64,6 +65,8 @@ QT_BEGIN_NAMESPACE +class QCoreTextFontEngine; + template <typename BaseEventDispatcher> class QOffscreenEventDispatcher : public BaseEventDispatcher { @@ -98,7 +101,7 @@ QOffscreenIntegration::QOffscreenIntegration() { #if defined(Q_OS_UNIX) #if defined(Q_OS_MAC) - m_fontDatabase.reset(new QPlatformFontDatabase()); + m_fontDatabase.reset(new QCoreTextFontDatabaseEngineFactory<QCoreTextFontEngine>); #else m_fontDatabase.reset(new QGenericUnixFontDatabase()); #endif |