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

 Conflicts:
	.qmake.conf

Change-Id: Iae5fa92dfdf8012315c043e20950368e42451e20

2 files changed, 48 insertions, 1 deletions

diff --git a/src/render/geometry/qbuffer.cpp b/src/render/geometry/qbuffer.cpp
index fe065929d..e0574a4c5 100644
--- a/src/render/geometry/qbuffer.cpp
+++ b/src/render/geometry/qbuffer.cpp
@@ -117,6 +117,12 @@ QBufferPrivate::QBufferPrivate()
  */
 
 /*!
+ * \fn void Qt3DRender::QBuffer::dataAvailable()
+ *
+ * This signal is emitted when data becomes available.
+ */
+
+/*!
     \class Qt3DRender::QBufferDataGenerator
     \inmodule Qt3DRender
 
@@ -252,6 +258,17 @@ QBufferPrivate::QBufferPrivate()
  */
 
 /*!
+ * \enum QBuffer::AccessType
+ *
+ * \value Write
+ *        Write access
+ * \value Read
+ *        Read access
+ * \value ReadWrite
+ *        Write|Read
+ */
+
+/*!
  * \typedef Qt3DRender::QBufferDataGeneratorPtr
  * \relates Qt3DRender::QBuffer
  */
@@ -443,6 +460,13 @@ bool QBuffer::isSyncData() const
     return d->m_syncData;
 }
 
+/*!
+ * \property Qt3DRender::QBuffer::accessType
+ *
+ * Returns the \l {QBuffer::}{AccessType} of the buffer.
+ *
+ * \sa QBuffer::AccessType
+ */
 QBuffer::AccessType QBuffer::accessType() const
 {
     Q_D(const QBuffer);
diff --git a/src/render/lights/qabstractlight.cpp b/src/render/lights/qabstractlight.cpp
index e5376f712..5ad16d3b4 100644
--- a/src/render/lights/qabstractlight.cpp
+++ b/src/render/lights/qabstractlight.cpp
@@ -67,9 +67,22 @@ QAbstractLightPrivate::~QAbstractLightPrivate()
 }
 
 /*!
+    \qmlproperty enumeration Qt3D.Render::Light::type
+    \readonly
+
+    Holds the particular type of light.
+
+    \value Light.PointLight
+           A point light
+    \value Light.DirectionalLight
+           A directional light
+    \value Light.SpotLight
+           a spot light
+*/
+/*!
     \property Qt3DRender::QAbstractLight::type
 
-    Contains the type of light.
+    The type of light.
 */
 /*!
     \enum Qt3DRender::QAbstractLight::Type
@@ -118,6 +131,11 @@ QAbstractLight::Type QAbstractLight::type() const
 }
 
 /*!
+ *  \qmlproperty QColor Qt3D.Render.Light::color
+ *
+ *  Holds the current Light color.
+ */
+/*!
  *  \property Qt3DRender::QAbstractLight::color
  *
  * Holds the current QAbstractLight color.
@@ -138,6 +156,11 @@ void QAbstractLight::setColor(const QColor &c)
 }
 
 /*!
+    \qmlproperty float Qt3D.Render.Light::intensity
+
+    Holds the current Light intensity.
+*/
+/*!
     \property Qt3DRender::QAbstractLight::intensity
 
     Holds the current QAbstractLight intensity.