diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-06-13 12:03:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-13 12:03:52 +0200 |
| commit | c5c6c9bc7074ee66e98d551ae13f999a6b8f7577 (patch) | |
| tree | a0ff80433c570bb8d4bf2bec4fe29dab19513aae /src/client/qwaylandintegration.cpp | |
| parent | f96198104d37e94cb7c4198ac7546e7301f849a3 (diff) | |
| parent | db7b958fb2d82a85ef45eba852cf411ebde852bf (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I6596d1a127cc93e53ec30cd881da1810cb8076d5
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 a3ae802ff..e935ef31f 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> @@ -118,7 +123,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()) |