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

Change-Id: Ia0f25a66addc32e9453968b9095c6830df09fa97

4 files changed, 14 insertions, 12 deletions

diff --git a/src/animation/frontend/qanimationaspect.cpp b/src/animation/frontend/qanimationaspect.cpp
index 9b23a7b1d..a25eb533e 100644
--- a/src/animation/frontend/qanimationaspect.cpp
+++ b/src/animation/frontend/qanimationaspect.cpp
@@ -96,6 +96,7 @@ QAnimationAspect::QAnimationAspect(QAnimationAspectPrivate &dd, QObject *parent)
     qRegisterMetaType<Qt3DAnimation::QAnimationClipLoader*>();
     qRegisterMetaType<Qt3DAnimation::QChannelMapper*>();
     qRegisterMetaType<QVector<Qt3DCore::Sqt>>();
+    qRegisterMetaType<Qt3DAnimation::QAbstractAnimationClip*>();
 
     registerBackendType<QAbstractAnimationClip>(
         QSharedPointer<Animation::NodeFunctor<Animation::AnimationClip, Animation::AnimationClipLoaderManager>>::create(d->m_handler.data(),
diff --git a/src/animation/frontend/qcallbackmapping.cpp b/src/animation/frontend/qcallbackmapping.cpp
index 3fcc7cf5e..c0163da80 100644
--- a/src/animation/frontend/qcallbackmapping.cpp
+++ b/src/animation/frontend/qcallbackmapping.cpp
@@ -107,7 +107,7 @@ void QCallbackMapping::setChannelName(const QString &channelName)
     Such mappings do not have to have a target object and property name. When
     the \a callback object is set, every change in the animated value will lead
     to invoking the callback's
-    \l{QAnimationCallback::onValueChanged()}{onValueChanged()} function either
+    \l {Qt3DAnimation::QAnimationCallback::valueChanged}{valueChanged} function either
     on the gui/main thread, or directly on one of the thread pool's worker
     thread. This is controlled by \a flags.
 
diff --git a/src/doc/src/qt3d-overview.qdoc b/src/doc/src/qt3d-overview.qdoc
index 5900f16ab..ec78791d6 100644
--- a/src/doc/src/qt3d-overview.qdoc
+++ b/src/doc/src/qt3d-overview.qdoc
@@ -49,14 +49,14 @@
     features:
 
     \list
-        \li 2D and 3D rendering for C++ and Qt Quick applications
-        \li Meshes and \l {Qt 3D Render Geometry}{Geometry}
+        \li  2D and 3D \l {Qt3DRender}{rendering} for C++ and Qt Quick applications
+        \li \l{Qt3DRender::QMesh}{Meshes} and \l {Qt 3D Render Geometry}{Geometry}
         \li \l {Materials}
         \li \l {Shaders}
         \li \l {Shadow Mapping}{Shadow mapping}
-        \li Ambient occlusion
+        \li \l {Qt3DExtras::QMetalRoughMaterial::ambientOcclusion}{Ambient occlusion}
         \li High dynamic range
-        \li Deferred rendering
+        \li \l {Deferred Renderer}{Deferred rendering}
         \li Multitexturing
         \li \l {Instanced Rendering}{Instanced rendering}
         \li \l {Uniform Buffer Objects}
@@ -89,7 +89,7 @@
     vertex, tessellation control, tessellation evaluation, geometry, and
     fragment shaders. Compute shaders are planned for a future release.
 
-    For examples of using shaders, see the Simple Shaders QML Example,
+    For examples of using shaders, see the \l {Simple Shader Example},
     \l {Qt 3D: Shadow Map QML Example}, \l{Qt 3D: Wireframe QML Example}, and
     \l {Qt 3D: Wave QML Example}.
 
@@ -173,10 +173,10 @@
     large amounts of data readily available. Typical use cases for UBOs are for
     sets of material or lighting parameters.
 
-    \section2 Pro Tips
+    \section2 Useful Tips
 
-    Because Murphy's law proves to often be true when it comes to 3D rendering,
-    \l {Qt 3D Render Pro Tips}{here} are a few points that might help you.
+    Some very useful programming tips for 3D rendering can be found on this
+    page: \l {Qt 3D Render Pro Tips}.
 
     \section1 Configurable Renderer
 
@@ -197,7 +197,7 @@
     \section1 3D Extensions
 
     Beyond the essentials of displaying 3D content on the screen, Qt 3D is
-    extensible and flexible enough to act as a host for following types of
+    extensible and flexible enough to act as a host for the following types of
     extensions related to the 3D objects:
 
     \list
@@ -277,7 +277,7 @@
 
     \section2 Using an ECS
 
-    In an ECS, an entity represents a simulated object but by itself is devoid
+    In an ECS, an entity represents a simulated object, but by itself it is devoid
     of any specific behavior or characteristics. Additional behavior can be
     grafted onto an entity by having the entity aggregate one or more
     components. Each component is a vertical slice of behavior of an object
@@ -373,7 +373,7 @@
 
     \section1 Qt 3D's Aspects
 
-    By default Qt 3D provides the Qt3DRender and Qt3DInput aspects. The
+    By default, Qt 3D provides the Qt3DRender and Qt3DInput aspects. The
     components and other supporting classes provided by these aspects are
     discussed in the documentation for those modules.
 
diff --git a/src/render/framegraph/qframegraphnode.cpp b/src/render/framegraph/qframegraphnode.cpp
index 3cf19d0d8..9acfd1209 100644
--- a/src/render/framegraph/qframegraphnode.cpp
+++ b/src/render/framegraph/qframegraphnode.cpp
@@ -215,6 +215,7 @@ QFrameGraphNode *QFrameGraphNode::parentFrameGraphNode() const
 }
 
 /*!
+    \internal
  * Returns a list of the children that are frame graph nodes.
  * If this function encounters a child node that is not a frame graph node,
  * it will go through the children of the child node and look for frame graph nodes.