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

Conflicts:
	src/animation/doc/src/qt3danimation-module.qdoc
	src/render/backend/abstractrenderer_p.h
	src/render/backend/buffervisitor_p.h
	src/render/backend/renderer.cpp
	src/render/backend/renderer_p.h
	src/render/backend/triangleboundingvolume_p.h
	src/render/backend/trianglesextractor_p.h
	src/render/frontend/sphere_p.h
	src/render/jobs/calcboundingvolumejob.cpp
	src/render/jobs/job_common_p.h
	src/render/jobs/pickboundingvolumejob.cpp
	src/render/jobs/pickboundingvolumejob_p.h
	src/render/jobs/pickboundingvolumeutils.cpp
	src/render/jobs/renderviewjobutils_p.h
	tests/auto/render/boundingsphere/tst_boundingsphere.cpp
	tests/auto/render/commons/testrenderer.h
	tests/auto/render/raycasting/tst_raycasting.cpp
	tests/auto/render/render.pro
	tests/auto/render/renderer/tst_renderer.cpp

Change-Id: I76633bc5a5a065e5f9ea62cc16563377e5c693a3

4 files changed, 30 insertions, 3 deletions

diff --git a/src/animation/doc/src/qt3danimation-module.qdoc b/src/animation/doc/src/qt3danimation-module.qdoc
index a056447e8..3aaf819db 100644
--- a/src/animation/doc/src/qt3danimation-module.qdoc
+++ b/src/animation/doc/src/qt3danimation-module.qdoc
@@ -29,8 +29,9 @@
 /*!
     \module Qt3DAnimation
     \title Qt 3D Animation C++ Classes
+
     \keyword Qt 3D Animation
-    \brief The Qt 3D Animation modules provides a set of prebuilt elements to help
+    \brief The Qt 3D Animation module provides a set of prebuilt elements to help
     you get started with Qt 3D.
 
     This module is still in tech preview. This means it is unstable, likely to
diff --git a/src/animation/frontend/qanimationcliploader.cpp b/src/animation/frontend/qanimationcliploader.cpp
index 8c59a4e10..f71ca40f7 100644
--- a/src/animation/frontend/qanimationcliploader.cpp
+++ b/src/animation/frontend/qanimationcliploader.cpp
@@ -61,7 +61,7 @@ void QAnimationClipLoaderPrivate::setStatus(QAnimationClipLoader::Status status)
 }
 
 /*!
-    \enum QAnimationClipLoader::Status
+    \enum Qt3DAnimation::QAnimationClipLoader::Status
 
     This enum identifies the status of animation clip.
 
@@ -70,7 +70,17 @@ void QAnimationClipLoaderPrivate::setStatus(QAnimationClipLoader::Status status)
     \value Error                 An error occurred while loading the clip
 */
 /*!
-    \class QAnimationClipLoader
+    \property Qt3DAnimation::QAnimationClipLoader::status
+
+    This property contains the status of the animation clip.
+*/
+/*!
+    \property Qt3DAnimation::QAnimationClipLoader::source
+
+    Holds the source URL from which to load the animation clip.
+*/
+/*!
+    \class Qt3DAnimation::QAnimationClipLoader
     \inherits QAbstractAnimationClip
     \inmodule Qt3DAnimation
     \brief Enables loading key frame animation data from a file
@@ -103,6 +113,9 @@ QUrl QAnimationClipLoader::source() const
     return d->m_source;
 }
 
+/*!
+    Returns the status of the animation clip.
+*/
 QAnimationClipLoader::Status QAnimationClipLoader::status() const
 {
     Q_D(const QAnimationClipLoader);
@@ -119,6 +132,9 @@ void QAnimationClipLoader::setSource(const QUrl &source)
     emit sourceChanged(source);
 }
 
+/*!
+    \internal
+*/
 void QAnimationClipLoader::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change)
 {
     Q_D(QAnimationClipLoader);
diff --git a/src/animation/frontend/qclipblendvalue.cpp b/src/animation/frontend/qclipblendvalue.cpp
index a17c63a69..c20609050 100644
--- a/src/animation/frontend/qclipblendvalue.cpp
+++ b/src/animation/frontend/qclipblendvalue.cpp
@@ -58,6 +58,11 @@ QClipBlendValuePrivate::QClipBlendValuePrivate()
    \inmodule Qt3DAnimation
    \brief Class used for including a clip in a blend tree.
 */
+/*!
+   \property Qt3DAnimation::QClipBlendValue::clip
+
+   The animation clip that needs to be included in the blend tree.
+*/
 QClipBlendValue::QClipBlendValue(Qt3DCore::QNode *parent)
     : QAbstractClipBlendNode(*new QClipBlendValuePrivate(), parent)
 {
diff --git a/src/animation/frontend/qclock.cpp b/src/animation/frontend/qclock.cpp
index 6dd851b88..717982902 100644
--- a/src/animation/frontend/qclock.cpp
+++ b/src/animation/frontend/qclock.cpp
@@ -61,6 +61,11 @@ QClock::QClock(QClockPrivate &dd, Qt3DCore::QNode *parent)
 QClock::~QClock()
 {
 }
+/*!
+    \property Qt3DAnimation::QClock::playbackRate
+
+    The playback speed of the animation.
+*/
 
 double QClock::playbackRate() const
 {