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-11 18:54:52 +0000 |
commit | 6b52c1834daec628bab5a384e1dfd039937b375d (patch) | |
tree | 0b8925dc9a7e6db8ab87d3bd16d77ec94ff55846 /src | |
parent | 9fbce8d5cbcc9d8d255328d6ec040db0510ca289 (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>
Diffstat (limited to 'src')
-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 01cd254501..9815be16a3 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 @@ -67,6 +68,8 @@ QT_BEGIN_NAMESPACE +class QCoreTextFontEngine; + template <typename BaseEventDispatcher> class QOffscreenEventDispatcher : public BaseEventDispatcher { @@ -101,7 +104,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 |