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 | |
| 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>
| -rw-r--r-- | qtwebglplugin.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/webgl/qwebglintegration.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/webgl/qwebglintegration_p.h | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/qtwebglplugin.pro b/qtwebglplugin.pro index c3e385d..cbad71e 100644 --- a/qtwebglplugin.pro +++ b/qtwebglplugin.pro @@ -1,3 +1,3 @@ -requires(!winrt:!macos:qtHaveModule(websockets):qtHaveModule(gui)) +requires(!winrt:qtHaveModule(websockets):qtHaveModule(gui)) load(qt_parts) 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 |