diff options
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/qwaylanddataoffer.cpp | 2 | ||||
| -rw-r--r-- | src/client/qwaylandintegration.cpp | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/client/qwaylanddataoffer.cpp b/src/client/qwaylanddataoffer.cpp index 35085a7f0..0c732c020 100644 --- a/src/client/qwaylanddataoffer.cpp +++ b/src/client/qwaylanddataoffer.cpp @@ -135,7 +135,7 @@ QVariant QWaylandMimeData::retrieveData_sys(const QString &mimeType, QVariant::T } int pipefd[2]; - if (::pipe2(pipefd, O_CLOEXEC|O_NONBLOCK) == -1) { + if (qt_safe_pipe(pipefd, O_NONBLOCK) == -1) { qWarning("QWaylandMimeData: pipe2() failed"); return QVariant(); } 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()) |