Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta1

Change-Id: I83392c13a9cea972fbb570a9510a19f401675283

1 files changed, 7 insertions, 7 deletions

diff --git a/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp b/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp
index b43ee957a..e52bb4852 100644
--- a/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp
+++ b/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp
@@ -50,12 +50,12 @@ QT_BEGIN_NAMESPACE
  * \inherits WaylandQuickItem
  * \inqmlmodule QtWayland.Compositor
  * \since 5.8
- * \brief A Qt Quick item type representing a WlShellSurface.
+ * \brief A Qt Quick item type for displaying and interacting with a ShellSurface.
  *
- * This type is used to render \c wl_shell or \c xdg_shell surfaces as part of a Qt Quick
- * scene. It handles moving and resizing triggered by clicking on the window decorations.
+ * This type is used to render \c wl_shell, \c xdg_shell or \c ivi_application surfaces as part of
+ * a Qt Quick scene. It handles moving and resizing triggered by clicking on the window decorations.
  *
- * \sa WaylandQuickItem
+ * \sa WaylandQuickItem, WlShellSurface, XdgSurfaceV5, IviSurface
  */
 
 /*!
@@ -64,10 +64,10 @@ QT_BEGIN_NAMESPACE
  * \since 5.8
  * \brief The QWaylandQuickShellSurfaceItem class provides a Qt Quick item that represents a QWaylandShellSurface.
  *
- * This class is used to render \c wl_shell or \c xdg_shell surfaces as part of a Qt Quick
- * scene. It handles moving and resizing triggered by clicking on the window decorations.
+ * This class is used to render \c wl_shell, \c xdg_shell or \c ivi_application surfaces as part of
+ * a Qt Quick scene. It handles moving and resizing triggered by clicking on the window decorations.
  *
- * \sa QWaylandQuickItem
+ * \sa QWaylandQuickItem, QWaylandWlShellSurface, QWaylandXdgSurfaceV5, QWaylandIviSurface
  */
 
 /*!