11 files changed, 30 insertions, 16 deletions
diff --git a/examples/wayland/overview-compositor/doc/src/overview-compositor.qdoc b/examples/wayland/overview-compositor/doc/src/overview-compositor.qdoc
index c34eeb2a7..50408bc56 100644
--- a/examples/wayland/overview-compositor/doc/src/overview-compositor.qdoc
+++ b/examples/wayland/overview-compositor/doc/src/overview-compositor.qdoc
@@ -28,6 +28,7 @@
 /*!
  * \title Qt Wayland Compositor Examples - Overview Compositor
  * \example overview-compositor
- * \brief Overview Compositor shows how to switch between clients in a grid
+ * \brief Overview Compositor shows how to switch between clients in a grid.
+ *
  * \ingroup qtwaylandcompositor-examples
  */
diff --git a/qtwayland.pro b/qtwayland.pro
index 04eca333b..fdcc3e24f 100644
--- a/qtwayland.pro
+++ b/qtwayland.pro
@@ -1,3 +1,3 @@
-requires(linux:!android)
+requires(linux:!android|macos)
 requires(qtHaveModule(gui))
 load(qt_parts)
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())
diff --git a/src/compositor/compositor_api/qwaylandbufferref.cpp b/src/compositor/compositor_api/qwaylandbufferref.cpp
index 82997a5d3..ab34d1253 100644
--- a/src/compositor/compositor_api/qwaylandbufferref.cpp
+++ b/src/compositor/compositor_api/qwaylandbufferref.cpp
@@ -59,7 +59,7 @@ public:
  * \class QWaylandBufferRef
  * \inmodule QtWaylandCompositor
  * \since 5.8
- * \brief The QWaylandBufferRef class holds the reference to a surface buffer
+ * \brief The QWaylandBufferRef class holds the reference to a surface buffer.
  *
  * This class can be used to reference a surface buffer. As long as a reference
  * to the buffer exists, it is owned by the compositor and the client cannot modify it.
diff --git a/src/compositor/compositor_api/qwaylandquickhardwarelayer.cpp b/src/compositor/compositor_api/qwaylandquickhardwarelayer.cpp
index f82de0014..11dd7b47d 100644
--- a/src/compositor/compositor_api/qwaylandquickhardwarelayer.cpp
+++ b/src/compositor/compositor_api/qwaylandquickhardwarelayer.cpp
@@ -87,7 +87,7 @@ QtWayland::HardwareLayerIntegration *QWaylandQuickHardwareLayerPrivate::layerInt
  * \qmltype WaylandHardwareLayer
  * \inqmlmodule QtWayland.Compositor
  * \preliminary
- * \brief Makes a parent WaylandQuickItem use hardware layers for rendering
+ * \brief Makes a parent WaylandQuickItem use hardware layers for rendering.
  *
  * This item needs to be a descendant of a WaylandQuickItem or a derivative,
  * (i.e. ShellSurfaceItem or similar)
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp
index d4cc94e4b..09e8f7621 100644
--- a/src/compositor/compositor_api/qwaylandquickitem.cpp
+++ b/src/compositor/compositor_api/qwaylandquickitem.cpp
@@ -1338,8 +1338,12 @@ void QWaylandQuickItem::handleDragStarted(QWaylandDrag *drag)
 
 qreal QWaylandQuickItemPrivate::scaleFactor() const
 {
-    return (view->output() ? view->output()->scaleFactor() : 1)
-            / (window ? window->devicePixelRatio() : 1);
+    qreal f = view->output() ? view->output()->scaleFactor() : 1;
+#if !defined(Q_OS_MACOS)
+    if (window)
+        f /= window->devicePixelRatio();
+#endif
+    return f;
 }
 
 QT_END_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandsurfacegrabber.cpp b/src/compositor/compositor_api/qwaylandsurfacegrabber.cpp
index 5db576221..d36efb543 100644
--- a/src/compositor/compositor_api/qwaylandsurfacegrabber.cpp
+++ b/src/compositor/compositor_api/qwaylandsurfacegrabber.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
     \class QWaylandSurfaceGrabber
     \inmodule QtWaylandCompositor
     \since 5.8
-    \brief The QWaylandSurfaceGrabber class allows to read the content of a QWaylandSurface
+    \brief The QWaylandSurfaceGrabber class allows to read the content of a QWaylandSurface.
 
     Sometimes it is needed to get the contents of a surface, for example to provide a screenshot
     to the user. The QWaylandSurfaceGrabber class provides a simple method to do so, without
diff --git a/src/compositor/extensions/qwaylandshellsurface.cpp b/src/compositor/extensions/qwaylandshellsurface.cpp
index c1cd5272e..3cfe44895 100644
--- a/src/compositor/extensions/qwaylandshellsurface.cpp
+++ b/src/compositor/extensions/qwaylandshellsurface.cpp
@@ -43,7 +43,7 @@
  * \qmltype ShellSurface
  * \inqmlmodule QtWayland.Compositor
  * \since 5.8
- * \brief Provides a common interface for surface roles specified by shell extensions
+ * \brief Provides a common interface for surface roles specified by shell extensions.
  *
  * This interface represents a Wayland surface role given by a Wayland protocol extension that
  * defines how the WaylandSurface should map onto the screen.
@@ -61,7 +61,7 @@
  * \class QWaylandShellSurface
  * \inmodule QtWaylandCompositor
  * \since 5.8
- * \brief The QWaylandShellSurface class is a common interface for surface roles specified by shell extensions
+ * \brief The QWaylandShellSurface class is a common interface for surface roles specified by shell extensions.
  *
  * This interface represents a Wayland surface role given by a Wayland protocol extension that
  * defines how the QWaylandSurface should map onto the screen.
diff --git a/src/compositor/extensions/qwaylandxdgshellv5.cpp b/src/compositor/extensions/qwaylandxdgshellv5.cpp
index cbcd50ae4..6bfaf7a61 100644
--- a/src/compositor/extensions/qwaylandxdgshellv5.cpp
+++ b/src/compositor/extensions/qwaylandxdgshellv5.cpp
@@ -1324,7 +1324,7 @@ QWaylandQuickShellIntegration *QWaylandXdgSurfaceV5::createIntegration(QWaylandQ
  * \class QWaylandXdgPopupV5
  * \inmodule QtWaylandCompositor
  * \since 5.8
- * \brief The QWaylandXdgPopupV5 class provides menus for an xdg surface
+ * \brief The QWaylandXdgPopupV5 class provides menus for an xdg surface.
  *
  * This class is part of the QWaylandXdgShellV5 extension and provides a way to
  * extend the functionality of an existing QWaylandSurface with features
diff --git a/src/compositor/extensions/qwaylandxdgshellv6.cpp b/src/compositor/extensions/qwaylandxdgshellv6.cpp
index c103dc03e..0c2159e18 100644
--- a/src/compositor/extensions/qwaylandxdgshellv6.cpp
+++ b/src/compositor/extensions/qwaylandxdgshellv6.cpp
@@ -704,7 +704,7 @@ QWaylandQuickShellIntegration *QWaylandXdgSurfaceV6::createIntegration(QWaylandQ
  * \qmltype XdgToplevelV6
  * \inqmlmodule QtWayland.Compositor
  * \since 5.10
- * \brief XdgToplevelV6 represents the toplevel window specific parts of an xdg surface
+ * \brief XdgToplevelV6 represents the toplevel window specific parts of an xdg surface.
  *
  * This type is part of the \l{XdgShellV6} extension and provides a way to
  * extend the functionality of an XdgSurfaceV6 with features
@@ -717,7 +717,7 @@ QWaylandQuickShellIntegration *QWaylandXdgSurfaceV6::createIntegration(QWaylandQ
  * \class QWaylandXdgToplevelV6
  * \inmodule QtWaylandCompositor
  * \since 5.10
- * \brief The QWaylandXdgToplevelV6 class represents the toplevel window specific parts of an xdg surface
+ * \brief The QWaylandXdgToplevelV6 class represents the toplevel window specific parts of an xdg surface.
  *
  * This class is part of the QWaylandXdgShellV6 extension and provides a way to
  * extend the functionality of an QWaylandXdgSurfaceV6 with features
@@ -1458,7 +1458,7 @@ void QWaylandXdgToplevelV6Private::zxdg_toplevel_v6_set_minimized(QtWaylandServe
  * \qmltype XdgPopupV6
  * \inqmlmodule QtWayland.Compositor
  * \since 5.10
- * \brief XdgPopupV6 represents the popup specific parts of and xdg surface
+ * \brief XdgPopupV6 represents the popup specific parts of and xdg surface.
  *
  * This type is part of the \l{XdgShellV6} extension and provides a way to extend
  * extend the functionality of an \l{XdgSurfaceV6} with features
@@ -1471,7 +1471,7 @@ void QWaylandXdgToplevelV6Private::zxdg_toplevel_v6_set_minimized(QtWaylandServe
  * \class QWaylandXdgPopupV6
  * \inmodule QtWaylandCompositor
  * \since 5.10
- * \brief The QWaylandXdgPopupV6 class represents the popup specific parts of an xdg surface
+ * \brief The QWaylandXdgPopupV6 class represents the popup specific parts of an xdg surface.
  *
  * This class is part of the QWaylandXdgShellV6 extension and provides a way to
  * extend the functionality of a QWaylandXdgSurfaceV6 with features