Merge remote-tracking branch 'origin/5.7' into 5.8

Conflicts:
	tests/manual/manual.pro

Change-Id: Ie1186d3465516d8d50b8261f72e64d8d454d377b

1 files changed, 34 insertions, 14 deletions

diff --git a/src/extras/geometries/qcuboidgeometry.cpp b/src/extras/geometries/qcuboidgeometry.cpp
index a632111f6..49f1cbff0 100644
--- a/src/extras/geometries/qcuboidgeometry.cpp
+++ b/src/extras/geometries/qcuboidgeometry.cpp
@@ -563,44 +563,54 @@ void QCuboidGeometryPrivate::init()
 
 /*!
  * \qmltype CuboidGeometry
- * \instantiates Qt3DRender::QCuboidGeometry
- * \inqmlmodule Qt3D.Render
+ * \instantiates Qt3DExtras::QCuboidGeometry
+ * \inqmlmodule Qt3D.Extras
+ * \brief CuboidGeometry allows creation of a cuboid in 3D space.
+ *
+ * The CuboidGeometry type is most commonly used internally by the CuboidMesh type
+ * but can also be used in custom GeometryRenderer types.
  */
 
 /*!
- * \qmlproperty float CuboidGeometry::xExtent
+ * \qmlproperty real CuboidGeometry::xExtent
  *
- * Holds the x extent.
+ * Holds the x extent of the geometry.
  */
 
 /*!
- * \qmlproperty float CuboidGeometry::yExtent
+ * \qmlproperty real CuboidGeometry::yExtent
  *
- * Holds the y extent.
+ * Holds the y extent of the geometry.
  */
 
 /*!
- * \qmlproperty float CuboidGeometry::zExtent
+ * \qmlproperty real CuboidGeometry::zExtent
  *
- * Holds the z extent.
+ * Holds the z extent of the geometry.
  */
 
 /*!
  * \qmlproperty size CuboidGeometry::yzMeshResolution
  *
  * Holds the y-z resolution.
+ * The width and height values of this property specify the number of vertices generated for
+ * the y-z faces of the mesh.
  */
 
 /*!
  * \qmlproperty size CuboidGeometry::xzMeshResolution
  *
  * Holds the x-z resolution.
+ * The width and height values of this property specify the number of vertices generated for
+ * the x-z faces of the mesh.
  */
 
 /*!
  * \qmlproperty size CuboidGeometry::xyMeshResolution
  *
  * Holds the x-y resolution.
+ * The width and height values of this property specify the number of vertices generated for
+ * the x-y faces of the mesh.
  */
 
 /*!
@@ -634,11 +644,15 @@ void QCuboidGeometryPrivate::init()
  */
 
 /*!
- * \class Qt3DRender::QCuboidGeometry
- * \inmodule Qt3DRender
- *
+ * \class Qt3DExtras::QCuboidGeometry
+ * \inmodule Qt3DExtras
+ * \brief The QCuboidGeometry class allows creation of a cuboid in 3D space.
+ * \since 5.7
+ * \ingroup geometries
  * \inherits Qt3DRender::QGeometry
  *
+ * The QCuboidGeometry class is most commonly used internally by the QCuboidMesh
+ * but can also be used in custom Qt3DRender::QGeometryRenderer subclasses.
  */
 
 /*!
@@ -770,7 +784,7 @@ void QCuboidGeometry::setXYMeshResolution(const QSize &resolution)
 /*!
  * \property QCuboidGeometry::xExtent
  *
- * Holds the x extent.
+ * Holds the x extent of the geometry.
  */
 float QCuboidGeometry::xExtent() const
 {
@@ -781,7 +795,7 @@ float QCuboidGeometry::xExtent() const
 /*!
  * \property QCuboidGeometry::yExtent
  *
- * Holds the y extent.
+ * Holds the y extent of the geometry.
  */
 float QCuboidGeometry::yExtent() const
 {
@@ -792,7 +806,7 @@ float QCuboidGeometry::yExtent() const
 /*!
  * \property QCuboidGeometry::zExtent
  *
- * Holds the z extent.
+ * Holds the z extent of the geometry.
  */
 float QCuboidGeometry::zExtent() const
 {
@@ -804,6 +818,8 @@ float QCuboidGeometry::zExtent() const
  * \property QCuboidGeometry::yzMeshResolution
  *
  * Holds the y-z resolution.
+ * The width and height values of this property specify the number of vertices generated for
+ * the y-z faces of the mesh.
  */
 QSize QCuboidGeometry::yzMeshResolution() const
 {
@@ -815,6 +831,8 @@ QSize QCuboidGeometry::yzMeshResolution() const
  * \property QCuboidGeometry::xzMeshResolution
  *
  * Holds the x-z resolution.
+ * The width and height values of this property specify the number of vertices generated for
+ * the x-z faces of the mesh.
  */
 QSize QCuboidGeometry::xyMeshResolution() const
 {
@@ -826,6 +844,8 @@ QSize QCuboidGeometry::xyMeshResolution() const
  * \property QCuboidGeometry::xyMeshResolution
  *
  * Holds the x-y resolution.
+ * The width and height values of this property specify the number of vertices generated for
+ * the x-y faces of the mesh.
  */
 QSize QCuboidGeometry::xzMeshResolution() const
 {