diff options
| author | Jesus Fernandez <jesus.fernandez@qt.io> | 2017-08-03 17:07:30 +0200 |
|---|---|---|
| committer | Jesus Fernandez <Jesus.Fernandez@qt.io> | 2017-08-04 08:46:40 +0000 |
| commit | dd09fcb43327fae721603a17bd86193397d7be6a (patch) | |
| tree | b3c07821d7a5b3a2029c447ce252b752418ac87f /src/plugins/platforms/webgl/qwebglintegration_p.h | |
| parent | 0fe0d6020ccb805f7b9ca138ce8d5eac11d884fe (diff) | |
Add macOS support
Change-Id: Id9e89530d7b7c4fb21bfede7a79a46dcbcbdcafb
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/plugins/platforms/webgl/qwebglintegration_p.h')
| -rw-r--r-- | src/plugins/platforms/webgl/qwebglintegration_p.h | 7 |
1 files changed, 6 insertions, 1 deletions
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 |