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

Change-Id: Ic4220f9957266c374f751d3612c60b81e9cea193

2 files changed, 20 insertions, 11 deletions

diff --git a/src/render/lights/qabstractlight.cpp b/src/render/lights/qabstractlight.cpp
index a826654c7..e5376f712 100644
--- a/src/render/lights/qabstractlight.cpp
+++ b/src/render/lights/qabstractlight.cpp
@@ -53,15 +53,6 @@ namespace Qt3DRender
  * \since 5.6
  */
 
-/*!
-    \enum QAbstractLight::Type
-
-    This enum type identifies the particular type of light.
-    \value PointLight
-    \value DirectionalLight
-    \value SpotLight
-*/
-
 QAbstractLightPrivate::QAbstractLightPrivate(QAbstractLight::Type type)
     : m_type(type)
     , m_shaderData(new QShaderData)
@@ -75,6 +66,20 @@ QAbstractLightPrivate::~QAbstractLightPrivate()
 {
 }
 
+/*!
+    \property Qt3DRender::QAbstractLight::type
+
+    Contains the type of light.
+*/
+/*!
+    \enum Qt3DRender::QAbstractLight::Type
+
+    Identifies the particular type of light.
+
+    \value PointLight
+    \value DirectionalLight
+    \value SpotLight
+*/
 Qt3DCore::QNodeCreatedChangeBasePtr QAbstractLight::createNodeCreationChange() const
 {
     auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QAbstractLightData>::create(this);
@@ -104,8 +109,6 @@ QAbstractLight::~QAbstractLight()
 }
 
 /*!
-    \property Qt3DRender::QAbstractLight::type
-
     Holds the current QAbstractLight type.
 */
 QAbstractLight::Type QAbstractLight::type() const
diff --git a/src/render/lights/qspotlight.cpp b/src/render/lights/qspotlight.cpp
index 81c18387b..09335d432 100644
--- a/src/render/lights/qspotlight.cpp
+++ b/src/render/lights/qspotlight.cpp
@@ -116,6 +116,12 @@ QSpotLight::QSpotLight(QSpotLightPrivate &dd, QNode *parent)
 }
 
 /*!
+  \fn QVector3D Qt3DRender::QSpotLight::attenuation() const
+
+  Returns the attenuation of the spot light.
+*/
+
+/*!
   \qmlproperty float Qt3D.Render::SpotLight::constantAttenuation
     Specifies the constant attenuation of the spot light
 */