diff options
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/platforms/webgl/qwebglintegration.cpp | 2 | ||||
-rw-r--r-- | src/plugins/platforms/webgl/qwebglintegration_p.h | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/platforms/webgl/qwebglintegration.cpp b/src/plugins/platforms/webgl/qwebglintegration.cpp index 85ec2f1..0d9902d 100644 --- a/src/plugins/platforms/webgl/qwebglintegration.cpp +++ b/src/plugins/platforms/webgl/qwebglintegration.cpp @@ -170,7 +170,7 @@ QPlatformFontDatabase *QWebGLIntegration::fontDatabase() const QPlatformTheme *QWebGLIntegration::createPlatformTheme(const QString &name) const { -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) || defined(Q_OS_MACOS) return QPlatformIntegration::createPlatformTheme(name); #else return QGenericUnixTheme::createUnixTheme(name); diff --git a/src/plugins/platforms/webgl/qwebglintegration_p.h b/src/plugins/platforms/webgl/qwebglintegration_p.h index dffcd9b..2bd4d9d 100644 --- a/src/plugins/platforms/webgl/qwebglintegration_p.h +++ b/src/plugins/platforms/webgl/qwebglintegration_p.h @@ -39,9 +39,12 @@ #include <QtCore/qwaitcondition.h> #include <QtGui/qpa/qplatforminputcontextfactory_p.h> -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) #include <QtFontDatabaseSupport/private/qwindowsfontdatabase_p.h> #include <QtEventDispatcherSupport/private/qwindowsguieventdispatcher_p.h> +#elif defined(Q_OS_MACOS) +#include <QtFontDatabaseSupport/private/qcoretextfontdatabase_p.h> +#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h> #else #include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> #include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h> @@ -69,6 +72,8 @@ public: quint16 httpPort = 0; #if defined(Q_OS_WIN) mutable QWindowsFontDatabase fontDatabase; +#elif defined(Q_OS_MACOS) + mutable QCoreTextFontDatabase fontDatabase; #else mutable QGenericUnixFontDatabase fontDatabase; #endif |