diff options
author | Robert Griebl <robert.griebl@pelagicore.com> | 2018-05-17 13:27:55 +0200 |
---|---|---|
committer | Robert Griebl <robert.griebl@pelagicore.com> | 2018-06-09 21:53:48 +0000 |
commit | db7b958fb2d82a85ef45eba852cf411ebde852bf (patch) | |
tree | 92e21231883b5451385e9747eba18bcd99f72c94 /src/client/qwaylandintegration.cpp | |
parent | 590d2e313c5a10dc9c7d61a654ada451e5df82aa (diff) |
Add support for building QtWayland on macOS
Change-Id: I98aadd5019e913bf0adcf0122b7b209981926278
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/client/qwaylandintegration.cpp')
-rw-r--r-- | src/client/qwaylandintegration.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index b804988b2..6b2faf0c4 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/qwaylandintegration.cpp @@ -52,7 +52,12 @@ #include "qwaylandwindowmanagerintegration_p.h" #include "qwaylandscreen_p.h" -#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> +#if defined(Q_OS_MACOS) +# include <QtFontDatabaseSupport/private/qcoretextfontdatabase_p.h> +# include <QtFontDatabaseSupport/private/qfontengine_coretext_p.h> +#else +# include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> +#endif #include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h> #include <QtThemeSupport/private/qgenericunixthemes_p.h> @@ -121,7 +126,11 @@ public: }; QWaylandIntegration::QWaylandIntegration() +#if defined(Q_OS_MACOS) + : mFontDb(new QCoreTextFontDatabaseEngineFactory<QCoreTextFontEngine>) +#else : mFontDb(new QGenericUnixFontDatabase()) +#endif , mNativeInterface(new QWaylandNativeInterface(this)) #if QT_CONFIG(accessibility) , mAccessibility(new QPlatformAccessibility()) |