Merge remote-tracking branch 'qt/5.15' into dev

Change-Id: Id0bb84667482232cb648f4984e9f9e2ea4c360c6

12 files changed, 62 insertions, 20 deletions

diff --git a/src/compositor/extensions/qwaylandidleinhibitv1.cpp b/src/compositor/extensions/qwaylandidleinhibitv1.cpp
index b97f5813..d034c47f 100644
--- a/src/compositor/extensions/qwaylandidleinhibitv1.cpp
+++ b/src/compositor/extensions/qwaylandidleinhibitv1.cpp
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
     \class QWaylandIdleInhibitManagerV1
     \inmodule QtWaylandCompositor
     \since 5.14
-    \brief Provides an extension that allows to inhibit the idle behavior of the compositor
+    \brief Provides an extension that allows to inhibit the idle behavior of the compositor.
     \sa QWaylandSurface::inhibitsIdle
 
     The QWaylandIdleInhibitV1 extension provides a way for a client to inhibit the idle behavior of
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
     \qmltype IdleInhibitManagerV1
     \inqmlmodule QtWayland.Compositor
     \since 5.14
-    \brief Provides an extension that allows to inhibit the idle behavior of the compositor
+    \brief Provides an extension that allows to inhibit the idle behavior of the compositor.
     \sa WaylandSurface::inhibitsIdle
 
     The IdleInhibitManagerV1 extension provides a way for a client to inhibit the idle behavior of
diff --git a/src/compositor/extensions/qwaylandiviapplication.cpp b/src/compositor/extensions/qwaylandiviapplication.cpp
index d0422a05..50242ab1 100644
--- a/src/compositor/extensions/qwaylandiviapplication.cpp
+++ b/src/compositor/extensions/qwaylandiviapplication.cpp
@@ -145,7 +145,7 @@ QByteArray QWaylandIviApplication::interfaceName()
  *
  * This signal is emitted when the client has requested an \c ivi_surface to be associated
  * with \a surface, which is identified by \a iviId. The handler for this signal is
- * expected to create the ivi surface and initialize it within the scope of the
+ * expected to create the ivi surface for \a resource and initialize it within the scope of the
  * signal emission. If no ivi surface is created, a default one will be created instead.
  */
 
diff --git a/src/compositor/extensions/qwaylandquickshellintegration.cpp b/src/compositor/extensions/qwaylandquickshellintegration.cpp
index 5d3d526f..100e4bd5 100644
--- a/src/compositor/extensions/qwaylandquickshellintegration.cpp
+++ b/src/compositor/extensions/qwaylandquickshellintegration.cpp
@@ -33,7 +33,7 @@
  * \class QWaylandQuickShellIntegration
  * \inmodule QtWaylandCompositor
  * \since 5.14
- * \brief Provides support for shell surface integration with QtQuick
+ * \brief Provides support for shell surface integration with QtQuick.
  *
  * Shell surface implementations should inherit from this class in order to provide
  * an integration between the shell surface and QtQuick.
diff --git a/src/compositor/extensions/qwaylandshellsurface.cpp b/src/compositor/extensions/qwaylandshellsurface.cpp
index 6fda778f..74194b35 100644
--- a/src/compositor/extensions/qwaylandshellsurface.cpp
+++ b/src/compositor/extensions/qwaylandshellsurface.cpp
@@ -64,7 +64,7 @@
  * \fn QWaylandQuickShellIntegration *QWaylandShellSurface::createIntegration(QWaylandQuickShellSurfaceItem *item)
  *
  * Creates a QWaylandQuickShellIntegration for this QWaylandQuickShellSurface. It's called
- * automatically when QWaylandQuickShellSurfaceItem::shellSurface is assigned.
+ * automatically when \a {item}'s \l {QWaylandQuickShellSurfaceItem::}{shellSurface} is assigned.
  *
  * \sa QWaylandQuickShellSurfaceItem
  */
diff --git a/src/compositor/extensions/qwaylandxdgoutputv1.cpp b/src/compositor/extensions/qwaylandxdgoutputv1.cpp
index 2ab26c16..817cb2e4 100644
--- a/src/compositor/extensions/qwaylandxdgoutputv1.cpp
+++ b/src/compositor/extensions/qwaylandxdgoutputv1.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
  * \qmltype XdgOutputManagerV1
  * \inqmlmodule QtWayland.Compositor
  * \since 5.14
- * \brief Provides an extension for describing outputs in a desktop oriented fashion
+ * \brief Provides an extension for describing outputs in a desktop oriented fashion.
  *
  * The XdgOutputManagerV1 extension provides a way for a compositor to describe outputs in a way
  * that is more in line with the concept of an output on desktop oriented systems.
@@ -104,7 +104,7 @@ QT_BEGIN_NAMESPACE
  * \class QWaylandXdgOutputManagerV1
  * \inmodule QtWaylandCompositor
  * \since 5.14
- * \brief Provides an extension for describing outputs in a desktop oriented fashion
+ * \brief Provides an extension for describing outputs in a desktop oriented fashion.
  *
  * The QWaylandXdgOutputManagerV1 extension provides a way for a compositor to describe outputs in a way
  * that is more in line with the concept of an output on desktop oriented systems.
diff --git a/src/compositor/extensions/qwaylandxdgshell.cpp b/src/compositor/extensions/qwaylandxdgshell.cpp
index 1b8a3c2e..6b7e8600 100644
--- a/src/compositor/extensions/qwaylandxdgshell.cpp
+++ b/src/compositor/extensions/qwaylandxdgshell.cpp
@@ -1725,7 +1725,7 @@ Qt::Orientations QWaylandXdgPopup::slideConstraints() const
     Q_D(const QWaylandXdgPopup);
     const uint flags = d->m_positionerData.constraintAdjustments;
 
-    Qt::Orientations constraints = 0;
+    Qt::Orientations constraints = {};
 
     if (flags & XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_SLIDE_X)
         constraints |= Qt::Horizontal;
@@ -1755,7 +1755,7 @@ Qt::Orientations QWaylandXdgPopup::flipConstraints() const
     Q_D(const QWaylandXdgPopup);
     const uint flags = d->m_positionerData.constraintAdjustments;
 
-    Qt::Orientations constraints = 0;
+    Qt::Orientations constraints = {};
 
     if (flags & XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_FLIP_X)
         constraints |= Qt::Horizontal;
@@ -1785,7 +1785,7 @@ Qt::Orientations QWaylandXdgPopup::resizeConstraints() const
     Q_D(const QWaylandXdgPopup);
     const uint flags = d->m_positionerData.constraintAdjustments;
 
-    Qt::Orientations constraints = 0;
+    Qt::Orientations constraints = {};
 
     if (flags & XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_RESIZE_X)
         constraints |= Qt::Horizontal;
diff --git a/src/compositor/extensions/qwaylandxdgshell.h b/src/compositor/extensions/qwaylandxdgshell.h
index 2e3e2818..c79b2235 100644
--- a/src/compositor/extensions/qwaylandxdgshell.h
+++ b/src/compositor/extensions/qwaylandxdgshell.h
@@ -153,7 +153,12 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgToplevel : public QObject
     Q_PROPERTY(bool fullscreen READ fullscreen NOTIFY fullscreenChanged)
     Q_PROPERTY(bool resizing READ resizing NOTIFY resizingChanged)
     Q_PROPERTY(bool activated READ activated NOTIFY activatedChanged)
+// QDoc fails to parse the property type that includes the keyword 'enum'
+#ifndef Q_CLANG_QDOC
     Q_PROPERTY(enum DecorationMode decorationMode READ decorationMode NOTIFY decorationModeChanged)
+#else
+    Q_PROPERTY(DecorationMode decorationMode READ decorationMode NOTIFY decorationModeChanged)
+#endif
 public:
     enum State : uint {
         MaximizedState  = 1,
diff --git a/src/compositor/extensions/qwaylandxdgshell_p.h b/src/compositor/extensions/qwaylandxdgshell_p.h
index 3223abf3..de48f481 100644
--- a/src/compositor/extensions/qwaylandxdgshell_p.h
+++ b/src/compositor/extensions/qwaylandxdgshell_p.h
@@ -63,8 +63,8 @@ QT_BEGIN_NAMESPACE
 struct Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgPositionerData {
     QSize size;
     QRect anchorRect;
-    Qt::Edges anchorEdges = 0;
-    Qt::Edges gravityEdges = 0;
+    Qt::Edges anchorEdges = {};
+    Qt::Edges gravityEdges = {};
     uint constraintAdjustments = XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_NONE;
     QPoint offset;
     QWaylandXdgPositionerData();
diff --git a/src/compositor/extensions/qwaylandxdgshellv5.cpp b/src/compositor/extensions/qwaylandxdgshellv5.cpp
index fab3c841..337540fc 100644
--- a/src/compositor/extensions/qwaylandxdgshellv5.cpp
+++ b/src/compositor/extensions/qwaylandxdgshellv5.cpp
@@ -591,7 +591,7 @@ QByteArray QWaylandXdgShellV5::interfaceName()
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::XdgShellV5::ping()
+ * \qmlmethod void QtWaylandCompositor::XdgShellV5::ping(WaylandClient client)
  *
  * Sends a ping event to the \a client. If the client replies to the event, the
  * pong signal will be emitted.
@@ -784,6 +784,36 @@ void QWaylandXdgShellV5::handleFocusChanged(QWaylandSurface *newSurface, QWaylan
  */
 
 /*!
+    \enum QWaylandXdgSurfaceV5::ResizeEdge
+
+    \value NoneEdge
+           No edge defined.
+    \value TopEdge
+           Top egde.
+    \value BottomEdge
+           Bottom edge.
+    \value LeftEdge
+           Left edge.
+    \value TopLeftEdge
+           Top-left edge.
+    \value BottomLeftEdge
+           Bottom-left edge.
+    \value RightEdge
+           Right edge.
+    \value TopRightEdge
+           Top-right edge.
+    \value BottomRightEdge
+           Bottom-right edge.
+ */
+
+/*!
+ * \fn QWaylandXdgSurfaceV5::setTopLevel()
+ *
+ * This signal is emitted when the parent surface is unset, effectively
+ * making the window top level.
+ */
+
+/*!
  * \qmlsignal QtWaylandCompositor::XdgSurfaceV5::setTopLevel()
  *
  * This signal is emitted when the parent surface is unset, effectively
@@ -791,6 +821,13 @@ void QWaylandXdgShellV5::handleFocusChanged(QWaylandSurface *newSurface, QWaylan
  */
 
 /*!
+ * \fn QWaylandXdgSurfaceV5::setTransient()
+ *
+ * This signal is emitted when the parent surface is set, effectively
+ * making the window transient.
+ */
+
+/*!
  * \qmlsignal QtWaylandCompositor::XdgSurfaceV5::setTransient()
  *
  * This signal is emitted when the parent surface is set, effectively
diff --git a/src/compositor/extensions/qwaylandxdgshellv6.cpp b/src/compositor/extensions/qwaylandxdgshellv6.cpp
index 934dccb0..94c430aa 100644
--- a/src/compositor/extensions/qwaylandxdgshellv6.cpp
+++ b/src/compositor/extensions/qwaylandxdgshellv6.cpp
@@ -1656,7 +1656,7 @@ Qt::Orientations QWaylandXdgPopupV6::slideConstraints() const
     Q_D(const QWaylandXdgPopupV6);
     const uint flags = d->m_positionerData.constraintAdjustments;
 
-    Qt::Orientations constraints = 0;
+    Qt::Orientations constraints = {};
 
     if (flags & ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_SLIDE_X)
         constraints |= Qt::Horizontal;
@@ -1686,7 +1686,7 @@ Qt::Orientations QWaylandXdgPopupV6::flipConstraints() const
     Q_D(const QWaylandXdgPopupV6);
     const uint flags = d->m_positionerData.constraintAdjustments;
 
-    Qt::Orientations constraints = 0;
+    Qt::Orientations constraints = {};
 
     if (flags & ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_FLIP_X)
         constraints |= Qt::Horizontal;
@@ -1716,7 +1716,7 @@ Qt::Orientations QWaylandXdgPopupV6::resizeConstraints() const
     Q_D(const QWaylandXdgPopupV6);
     const uint flags = d->m_positionerData.constraintAdjustments;
 
-    Qt::Orientations constraints = 0;
+    Qt::Orientations constraints = {};
 
     if (flags & ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_RESIZE_X)
         constraints |= Qt::Horizontal;
diff --git a/src/compositor/extensions/qwaylandxdgshellv6_p.h b/src/compositor/extensions/qwaylandxdgshellv6_p.h
index 457bc220..f13e73da 100644
--- a/src/compositor/extensions/qwaylandxdgshellv6_p.h
+++ b/src/compositor/extensions/qwaylandxdgshellv6_p.h
@@ -61,8 +61,8 @@ QT_BEGIN_NAMESPACE
 struct Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgPositionerV6Data {
     QSize size;
     QRect anchorRect;
-    Qt::Edges anchorEdges = 0;
-    Qt::Edges gravityEdges = 0;
+    Qt::Edges anchorEdges = {};
+    Qt::Edges gravityEdges = {};
     uint constraintAdjustments = ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_NONE;
     QPoint offset;
     QWaylandXdgPositionerV6Data();
diff --git a/src/compositor/extensions/qwltexturesharingextension.cpp b/src/compositor/extensions/qwltexturesharingextension.cpp
index 6f801e95..bbd18e1a 100644
--- a/src/compositor/extensions/qwltexturesharingextension.cpp
+++ b/src/compositor/extensions/qwltexturesharingextension.cpp
@@ -301,13 +301,13 @@ QString QWaylandTextureSharingExtension::getExistingFilePath(const QString &key)
     if (key.contains(QLatin1String("../")))
         return QString();
 
-    for (auto dir : m_image_dirs) {
+    for (auto dir : qAsConst(m_image_dirs)) {
         QString path = dir + key;
         if (QFileInfo::exists(path))
             return path;
     }
 
-    for (auto dir : m_image_dirs) {
+    for (auto dir : qAsConst(m_image_dirs)) {
         for (auto ext : m_image_suffixes) {
             QString fp = dir + key + ext;
             //qDebug() << "trying" << fp;