Merge remote-tracking branch 'origin/5.11' into dev

 Conflicts:
	src/client/qwaylandxdgsurface.cpp
	src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurfacev5.cpp
	src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6.cpp
	src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6_p.h

Done-with: Johan Klokkhammer Helsing <johan.helsing@qt.io>
Change-Id: Ia39be6254a95af1c4efa831358cc06a697da3423

4 files changed, 10 insertions, 7 deletions

diff --git a/src/compositor/extensions/extensions.pri b/src/compositor/extensions/extensions.pri
index 77c09aa23..d51a75b5d 100644
--- a/src/compositor/extensions/extensions.pri
+++ b/src/compositor/extensions/extensions.pri
@@ -1,6 +1,9 @@
 CONFIG += wayland-scanner
 CONFIG += generated_privates
 
+# make sure we install the headers generated by wayland-scanner
+private_headers.CONFIG += no_check_exist
+
 WAYLANDSERVERSOURCES += \
     ../extensions/touch-extension.xml \
     ../extensions/qt-key-unstable-v1.xml \
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 342edfd14..8cde4668e 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
@@ -1462,7 +1462,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
@@ -1475,7 +1475,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