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

Conflicts:
	src/doc/src/qt3dcollision-module.qdoc
	src/render/frontend/qcamera.cpp
	src/render/frontend/qcameralens.cpp

Change-Id: I8a0ae250a6b8e065a1ef3c817968ebb7ef23b20d

4 files changed, 1 insertions, 11 deletions

diff --git a/src/quick3d/quick3d/items/quick3dentityloader.cpp b/src/quick3d/quick3d/items/quick3dentityloader.cpp
index 501024bbd..eb403ff6d 100644
--- a/src/quick3d/quick3d/items/quick3dentityloader.cpp
+++ b/src/quick3d/quick3d/items/quick3dentityloader.cpp
@@ -146,10 +146,6 @@ void Quick3DEntityLoader::copy(const QNode *ref)
     d_func()->m_entity->setParent(this);
 }
 
-/*!
-    \class Qt3DCore::Quick::Quick3DEntityLoaderPrivate
-    \internal
-*/
 Quick3DEntityLoaderPrivate::Quick3DEntityLoaderPrivate()
     : QEntityPrivate(),
       m_incubator(Q_NULLPTR),
diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
index 213446a70..32a82ad98 100644
--- a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
+++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
@@ -81,7 +81,6 @@ public:
 };
 
 /*!
-    \class Qt3DCore::Quick::Quick3DNodeInstantiatorPrivate
     \internal
 */
 Quick3DNodeInstantiatorPrivate::Quick3DNodeInstantiatorPrivate()
diff --git a/src/quick3d/quick3d/qqmlaspectengine.cpp b/src/quick3d/quick3d/qqmlaspectengine.cpp
index a791877ca..931096bb6 100644
--- a/src/quick3d/quick3d/qqmlaspectengine.cpp
+++ b/src/quick3d/quick3d/qqmlaspectengine.cpp
@@ -48,10 +48,6 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DCore {
 namespace Quick {
 
-/*!
-    \class Qt3DCore::Quick::QQmlAspectEnginePrivate
-    \internal
-*/
 QQmlAspectEnginePrivate::QQmlAspectEnginePrivate()
     : QObjectPrivate()
     , m_qmlEngine(new QQmlEngine())
diff --git a/src/quick3d/quick3d/qquaternionanimation.cpp b/src/quick3d/quick3d/qquaternionanimation.cpp
index b049381d3..25cad523b 100644
--- a/src/quick3d/quick3d/qquaternionanimation.cpp
+++ b/src/quick3d/quick3d/qquaternionanimation.cpp
@@ -44,9 +44,8 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype QuaternionAnimation
-    \instantiates QQuaternionAnimation
     \inherits PropertyAnimation
-    \inqmlmodule Qt3D
+    \inqmlmodule Qt3D.Core
     \since 5.6
 
     \brief A PropertyAnimation for quaternions.