Doc: link and qdoc errors Qt3D

Task-number: QTBUG-44180
Change-Id: Ic798dee5d33dbf18dbc9d978a0f07217895a30ee
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>

6 files changed, 99 insertions, 167 deletions

diff --git a/src/render/defaults/qdiffusemapmaterial.cpp b/src/render/defaults/qdiffusemapmaterial.cpp
index 63612b6c4..16da18cd9 100644
--- a/src/render/defaults/qdiffusemapmaterial.cpp
+++ b/src/render/defaults/qdiffusemapmaterial.cpp
@@ -146,10 +146,8 @@ void QDiffuseMapMaterialPrivate::init()
 */
 
 /*!
-    \fn Qt3D::QDiffuseMapMaterial::QDiffuseMapMaterial()
     Constructs a new Qt3D::QDiffuseMapMaterial instance with parent object \a parent.
  */
-
 QDiffuseMapMaterial::QDiffuseMapMaterial(QNode *parent)
     : QMaterial(*new QDiffuseMapMaterialPrivate(this), parent)
 {
@@ -167,9 +165,11 @@ QDiffuseMapMaterial::~QDiffuseMapMaterial()
 }
 
 /*!
-    \fn Qt3D::QDiffuseMapMaterial::ambient() const
-    \return the current QColor ambient value.
+    \property Qt3D::QDiffuseMapMaterial::ambient
+
+    Holds the current QColor ambient value.
  */
+
 QColor QDiffuseMapMaterial::ambient() const
 {
     Q_D(const QDiffuseMapMaterial);
@@ -177,8 +177,9 @@ QColor QDiffuseMapMaterial::ambient() const
 }
 
 /*!
-    \fn Qt3D::QDiffuseMapMaterial::specular() const
-    \return the current QColor specular value.
+    \property QDiffuseMapMaterial::specular
+
+    Holds the current QColor specular value.
  */
 QColor QDiffuseMapMaterial::specular() const
 {
@@ -187,8 +188,9 @@ QColor QDiffuseMapMaterial::specular() const
 }
 
 /*!
-    \fn Qt3D::QDiffuseMapMaterial::shininess() const
-    \return the current shininess as a float value.
+    \property QDiffuseMapMaterial::shininess
+
+    Holds the current shininess as a float value.
  */
 float QDiffuseMapMaterial::shininess() const
 {
@@ -197,9 +199,11 @@ float QDiffuseMapMaterial::shininess() const
 }
 
 /*!
-    \fn Qt3D::QDiffuseMapMaterial::diffuse() const
-    \return the current QTexture used as the diffuse map.
-    \b {Note:} By default the diffuse texture has a linear
+    \property QAbstractTextureProvider *QDiffuseMapMaterial::diffuse
+
+    Holds the current QTexture used as the diffuse map.
+
+    \note By default, the diffuse texture has a linear
     magnification filter, a linear mipmap linear minification filter,
     the wrap mode is repeat, the maximum anisotropy is set to 16.0
     and mipmapping is enabled.
@@ -211,8 +215,9 @@ QAbstractTextureProvider *QDiffuseMapMaterial::diffuse() const
 }
 
 /*!
-    \fn Qt3D::QDiffuseMapMaterial::textureScale() const
-    \return the current texture scale.
+    \property QDiffuseMapMaterial::textureScale
+
+    Holds the current texture scale.
  */
 float QDiffuseMapMaterial::textureScale() const
 {
@@ -220,50 +225,30 @@ float QDiffuseMapMaterial::textureScale() const
     return d->m_textureScaleParameter->value().toFloat();
 }
 
-/*!
-    \fn Qt3D::QDiffuseMapMaterial::setAmbient(const QColor &ambient)
-    Sets the current ambient color to \a ambient.
- */
 void QDiffuseMapMaterial::setAmbient(const QColor &ambient)
 {
     Q_D(const QDiffuseMapMaterial);
     d->m_ambientParameter->setValue(ambient);
 }
 
-/*!
-    \fn Qt3D::QDiffuseMapMaterial::setSpecular(const QColor &specular)
-    Sets the current specular color to \a specular.
- */
 void QDiffuseMapMaterial::setSpecular(const QColor &specular)
 {
     Q_D(QDiffuseMapMaterial);
     d->m_specularParameter->setValue(specular);
 }
 
-/*!
-    \fn Qt3D::QDiffuseMapMaterial::setShininess(float shininess)
-    Sets the current shininess value to \a shininess.
- */
 void QDiffuseMapMaterial::setShininess(float shininess)
 {
     Q_D(QDiffuseMapMaterial);
     d->m_shininessParameter->setValue(shininess);
 }
 
-/*!
-    \fn Qt3D::QDiffuseMapMaterial::setDiffuse(QTexture *diffuseMap)
-    Sets the current diffuse map to \a diffuseMap.
- */
 void QDiffuseMapMaterial::setDiffuse(QAbstractTextureProvider *diffuseMap)
 {
     Q_D(QDiffuseMapMaterial);
     d->m_diffuseParameter->setValue(QVariant::fromValue(diffuseMap));
 }
 
-/*!
-    \fn Qt3D::QDiffuseMapMaterial::setTextureScale(float textureScale)
-    Sets the current texture scale to \a textureScale.
- */
 void QDiffuseMapMaterial::setTextureScale(float textureScale)
 {
     Q_D(QDiffuseMapMaterial);
diff --git a/src/render/defaults/qdiffusespecularmapmaterial.cpp b/src/render/defaults/qdiffusespecularmapmaterial.cpp
index 71eefa9d4..16a758e2e 100644
--- a/src/render/defaults/qdiffusespecularmapmaterial.cpp
+++ b/src/render/defaults/qdiffusespecularmapmaterial.cpp
@@ -154,8 +154,7 @@ void QDiffuseSpecularMapMaterialPrivate::init()
 */
 
 /*!
-    \fn Qt3D::QDiffuseSpecularMapMaterial::QDiffuseSpecularMapMaterial()
-    Constructs a new Qt3D::QDiffuseSpecularMapMaterial instance with parent object \a parent.
+ Constructs a new Qt3D::QDiffuseSpecularMapMaterial instance with parent object \a parent.
 */
 QDiffuseSpecularMapMaterial::QDiffuseSpecularMapMaterial(QNode *parent)
     : QMaterial(*new QDiffuseSpecularMapMaterialPrivate(this), parent)
@@ -174,9 +173,10 @@ QDiffuseSpecularMapMaterial::~QDiffuseSpecularMapMaterial()
 }
 
 /*!
-    \fn Qt3D::QDiffuseSpecularMapMaterial::ambient() const
-    \return the current QColor ambient value.
- */
+    \property Qt3D::QDiffuseSpecularMapMaterial::ambient
+
+    Holds the current QColor ambient value.
+*/
 QColor QDiffuseSpecularMapMaterial::ambient() const
 {
     Q_D(const QDiffuseSpecularMapMaterial);
@@ -184,9 +184,11 @@ QColor QDiffuseSpecularMapMaterial::ambient() const
 }
 
 /*!
-    \fn Qt3D::QDiffuseSpecularMapMaterial::diffuse() const
-    \return the current diffuse map texture.
-    \b {Note:} By default the diffuse texture has a linear
+    \property *QDiffuseSpecularMapMaterial::diffuse
+
+    Holds the current diffuse map texture.
+
+    \note By default the diffuse texture has a linear
     magnification filter, a linear mipmap linear minification filter,
     the wrap mode is repeat, the maximum anisotropy is set to 16.0
     and mipmapping is enabled.
@@ -198,9 +200,11 @@ QAbstractTextureProvider *QDiffuseSpecularMapMaterial::diffuse() const
 }
 
 /*!
-    \fn Qt3D::QDiffuseSpecularMapMaterial::specular() const
-    \return the current specular map texture.
-    \b {Note:} By default the specular texture has a linear
+    \property Qt3D::QDiffuseSpecularMapMaterial::specular
+
+    Holds the current specular map texture.
+
+    \note By default the specular texture has a linear
     magnification filter, a linear mipmap linear minification filter,
     the wrap mode is repeat, the maximum anisotropy is set to 16.0
     and mipmapping is enabled.
@@ -212,8 +216,10 @@ QAbstractTextureProvider *QDiffuseSpecularMapMaterial::specular() const
 }
 
 /*!
-    \fn Qt3D::QDiffuseSpecularMapMaterial::shininess() const
-    \return the current shininess as a float value.
+    \property Qt3D::QDiffuseSpecularMapMaterial::shininess
+
+    Holds the current shininess as a float value.
+
  */
 float QDiffuseSpecularMapMaterial::shininess() const
 {
@@ -222,8 +228,9 @@ float QDiffuseSpecularMapMaterial::shininess() const
 }
 
 /*!
-    \fn Qt3D::QDiffuseSpecularMapMaterial::textureScale() const
-    \return the current texture scale.
+    \property Qt3D::QDiffuseSpecularMapMaterial::textureScale
+
+    Holds the current texture scale.
  */
 float QDiffuseSpecularMapMaterial::textureScale() const
 {
@@ -231,50 +238,30 @@ float QDiffuseSpecularMapMaterial::textureScale() const
     return d->m_textureScaleParameter->value().toFloat();
 }
 
-/*!
-    \fn Qt3D::QDiffuseSpecularMapMaterial::setAmbient(const QColor &ambient)
-    Sets the current ambient color to \a ambient
- */
 void QDiffuseSpecularMapMaterial::setAmbient(const QColor &ambient)
 {
     Q_D(QDiffuseSpecularMapMaterial);
     d->m_ambientParameter->setValue(ambient);
 }
 
-/*!
-    \fn Qt3D::QDiffuseSpecularMapMaterial::setDiffuse(QTexture *diffuse)
-    Sets the current diffuse map to \a diffuse.
- */
 void QDiffuseSpecularMapMaterial::setDiffuse(QAbstractTextureProvider *diffuse)
 {
     Q_D(QDiffuseSpecularMapMaterial);
     d->m_diffuseParameter->setValue(QVariant::fromValue(diffuse));
 }
 
-/*!
-    \fn Qt3D::QDiffuseSpecularMapMaterial::setSpecular(QTexture *specular)
-    Sets the current specular map to \a specular.
- */
 void QDiffuseSpecularMapMaterial::setSpecular(QAbstractTextureProvider *specular)
 {
     Q_D(QDiffuseSpecularMapMaterial);
     d->m_specularParameter->setValue(QVariant::fromValue(specular));
 }
 
-/*!
-    \fn Qt3D::QDiffuseSpecularMapMaterial::setShininess(float shininess)
-    Sets the current shininess value to \a shininess.
- */
 void QDiffuseSpecularMapMaterial::setShininess(float shininess)
 {
     Q_D(QDiffuseSpecularMapMaterial);
     d->m_shininessParameter->setValue(shininess);
 }
 
-/*!
-    \fn Qt3D::QDiffuseSpecularMapMaterial::setTextureScale(float textureScale)
-    Sets the current texture scale to \a textureScale.
- */
 void QDiffuseSpecularMapMaterial::setTextureScale(float textureScale)
 {
     Q_D(QDiffuseSpecularMapMaterial);
diff --git a/src/render/defaults/qforwardrenderer.cpp b/src/render/defaults/qforwardrenderer.cpp
index c8bf9e8d7..feb8af0ad 100644
--- a/src/render/defaults/qforwardrenderer.cpp
+++ b/src/render/defaults/qforwardrenderer.cpp
@@ -74,7 +74,7 @@ void QForwardRendererPrivate::init()
 
 /*!
     \class Qt3D::QForwardRenderer
-    \brief The Qt3D::QForwardRenderer provides a default FrameGraph implementation of a forward renderer.
+    \brief The Qt3D::QForwardRenderer provides a default \l {QFrameGraph}{FrameGraph} implementation of a forward renderer.
     \inmodule Qt3DRender
     \since 5.5
 
@@ -85,7 +85,7 @@ void QForwardRendererPrivate::init()
     This a is a single leaf Framegraph tree which contains a Qt3D::QViewport, a Qt3D::QCameraSelector
     and a Qt3D::QClearBuffer.
     The Qt3D::QForwardRenderer has a default requirement annotation whose name is "renderingStyle" and value "forward".
-    If you need to filter out your techniques, you should do so based on that annocation.
+    If you need to filter out your techniques, you should do so based on that annotation.
 
     By default the viewport occupies the whole screen and the clear color is white.
 */
@@ -108,20 +108,12 @@ QForwardRenderer::~QForwardRenderer()
 {
 }
 
-/*!
-    \fn Qt3D::QForwardRenderer::setViewportRect(const QRectF &viewportRect)
-    Sets the current viewport rect to \a viewportRect.
- */
 void QForwardRenderer::setViewportRect(const QRectF &viewportRect)
 {
     Q_D(QForwardRenderer);
     d->m_viewport->setRect(viewportRect);
 }
 
-/*!
-    \fn Qt3D::QForwardRenderer::setClearColor(const QColor &clearColor)
-    Sets the clearColor to \a clearColor.
- */
 void QForwardRenderer::setClearColor(const QColor &clearColor)
 {
     Q_D(QForwardRenderer);
@@ -129,9 +121,9 @@ void QForwardRenderer::setClearColor(const QColor &clearColor)
 }
 
 /*!
-    \fn Qt3D::QForwardRenderer::setCamera(QEntity *camera)
     Sets the camera which should be used to render the scene to \a camera.
-    \b {Note:} A camera is a QEntity having a QCameraLens has one of its components
+
+    \note A camera is a QEntity having a QCameraLens as one of its components.
  */
 void QForwardRenderer::setCamera(QEntity *camera)
 {
@@ -140,8 +132,9 @@ void QForwardRenderer::setCamera(QEntity *camera)
 }
 
 /*!
-    \fn Qt3D::QForwardRenderer::viewportRect() const
-    \return the current viewport rect.
+    \property Qt3D::QForwardRenderer::viewportRect
+
+    Holds the current viewport rect.
  */
 QRectF QForwardRenderer::viewportRect() const
 {
@@ -150,8 +143,9 @@ QRectF QForwardRenderer::viewportRect() const
 }
 
 /*!
-    \fn Qt3D::QForwardRenderer::clearColor() const
-    \return the current clearColor.
+    \property Qt3D::QForwardRenderer::clearColor
+
+    Holds the current clearColor.
  */
 QColor QForwardRenderer::clearColor() const
 {
@@ -160,8 +154,9 @@ QColor QForwardRenderer::clearColor() const
 }
 
 /*!
-    \fn Qt3D::QForwardRenderer::camera() const
-    \return the current QEntity camera used to render the scene.
+    \property Qt3D::QForwardRenderer::camera
+
+    Holds the current QEntity camera used to render the scene.
  */
 QEntity *QForwardRenderer::camera() const
 {
diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp
index 66a78fed6..13d0f1594 100644
--- a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp
+++ b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp
@@ -141,9 +141,7 @@ void QNormalDiffuseMapAlphaMaterialPrivate::init()
     This material uses an effect with a single render pass approach and performs per fragment lighting.
     Techniques are provided for OpenGL 2, OpenGL 3 or above as well as OpenGL ES 2.
 */
-
 /*!
-    \fn Qt3D::QNormalDiffuseMapAlphaMaterial::QNormalDiffuseMapAlphaMaterial()
     Constructs a new Qt3D::QNormalDiffuseMapAlphaMaterial instance with parent object \a parent.
 */
 QNormalDiffuseMapAlphaMaterial::QNormalDiffuseMapAlphaMaterial(QNode *parent)
diff --git a/src/render/defaults/qnormaldiffusemapmaterial.cpp b/src/render/defaults/qnormaldiffusemapmaterial.cpp
index cde3145f9..de1e63579 100644
--- a/src/render/defaults/qnormaldiffusemapmaterial.cpp
+++ b/src/render/defaults/qnormaldiffusemapmaterial.cpp
@@ -155,7 +155,6 @@ void QNormalDiffuseMapMaterialPrivate::init()
 */
 
 /*!
-    \fn Qt3D::QNormalDiffuseMapMaterial::QNormalDiffuseMapMaterial()
     Constructs a new Qt3D::QNormalDiffuseMapMaterial instance with parent object \a parent.
 */
 QNormalDiffuseMapMaterial::QNormalDiffuseMapMaterial(QNode *parent)
@@ -189,8 +188,9 @@ QNormalDiffuseMapMaterial::~QNormalDiffuseMapMaterial()
 }
 
 /*!
-    \fn Qt3D::QNormalDiffuseMapMaterial::ambient() const
-    \return the current QColor ambient value.
+    \property QNormalDiffuseMapMaterial::ambient
+
+    Holds the current QColor ambient value.
  */
 QColor QNormalDiffuseMapMaterial::ambient() const
 {
@@ -199,8 +199,9 @@ QColor QNormalDiffuseMapMaterial::ambient() const
 }
 
 /*!
-    \fn Qt3D::QNormalDiffuseMapMaterial::specular() const
-    \return the current QColor specular value.
+    \property QNormalDiffuseMapMaterial::specular
+
+    Holds the current QColor specular value.
  */
 QColor QNormalDiffuseMapMaterial::specular() const
 {
@@ -209,9 +210,11 @@ QColor QNormalDiffuseMapMaterial::specular() const
 }
 
 /*!
-    \fn Qt3D::QNormalDiffuseMapMaterial::diffuse() const
-    \return the current diffuse map texture.
-    \b {Note:} By default the diffuse texture has a linear
+    \property *QNormalDiffuseMapMaterial::diffuse
+
+    Holds the current diffuse map texture.
+
+    \note By default the diffuse texture has a linear
     magnification filter, a linear mipmap linear minification filter,
     the wrap mode is repeat, the maximum anisotropy is set to 16.0
     and mipmapping is enabled.
@@ -223,9 +226,11 @@ QAbstractTextureProvider *QNormalDiffuseMapMaterial::diffuse() const
 }
 
 /*!
-    \fn Qt3D::QNormalDiffuseMapMaterial::normal() const
-    \return the current normal map texture.
-    \b {Note:} By default the normal texture has linear minification
+    \property *QNormalDiffuseMapMaterial::normal
+
+    Holds the current normal map texture.
+
+    \note By default the normal texture has linear minification
     and magnification filters, the wrap mode is repeat and maximum anisotropy
     is set to 16.0.
  */
@@ -236,8 +241,9 @@ QAbstractTextureProvider *QNormalDiffuseMapMaterial::normal() const
 }
 
 /*!
-    \fn Qt3D::QNormalDiffuseMapMaterial::shininess() const
-    \return the current shininess as a float value.
+    \property QNormalDiffuseMapMaterial::shininess
+
+    Holds the current shininess as a float value.
  */
 float QNormalDiffuseMapMaterial::shininess() const
 {
@@ -246,8 +252,9 @@ float QNormalDiffuseMapMaterial::shininess() const
 }
 
 /*!
-    \fn Qt3D::QNormalDiffuseMapMaterial::textureScale() const
-    \return the current texture scale.
+    \property QNormalDiffuseMapMaterial::textureScale
+
+    Holds the current texture scale.
  */
 float QNormalDiffuseMapMaterial::textureScale() const
 {
@@ -255,60 +262,36 @@ float QNormalDiffuseMapMaterial::textureScale() const
     return d->m_textureScaleParameter->value().toFloat();
 }
 
-/*!
-    \fn Qt3D::QNormalDiffuseMapMaterial::setAmbient(const QColor &ambient)
-    Sets the current ambient color to \a ambient
- */
 void QNormalDiffuseMapMaterial::setAmbient(const QColor &ambient)
 {
     Q_D(QNormalDiffuseMapMaterial);
     d->m_ambientParameter->setValue(ambient);
 }
 
-/*!
-    \fn Qt3D::QNormalDiffuseMapMaterial::setSpecular(const QColor &specular)
-    Sets the current specular color to \a specular.
- */
 void QNormalDiffuseMapMaterial::setSpecular(const QColor &specular)
 {
     Q_D(QNormalDiffuseMapMaterial);
     d->m_specularParameter->setValue(specular);
 }
 
-/*!
-    \fn Qt3D::QNormalDiffuseMapMaterial::setDiffuse(QTexture *diffuse)
-    Sets the current diffuse map to \a diffuse.
- */
 void QNormalDiffuseMapMaterial::setDiffuse(QAbstractTextureProvider *diffuse)
 {
     Q_D(QNormalDiffuseMapMaterial);
     d->m_diffuseParameter->setValue(QVariant::fromValue(diffuse));
 }
 
-/*!
-    \fn Qt3D::QNormalDiffuseMapMaterial::setNormal(QTexture *normal)
-    Sets the current normal map to \a normal.
- */
 void QNormalDiffuseMapMaterial::setNormal(QAbstractTextureProvider *normal)
 {
     Q_D(QNormalDiffuseMapMaterial);
     d->m_normalParameter->setValue(QVariant::fromValue(normal));
 }
 
-/*!
-    \fn Qt3D::QNormalDiffuseMapMaterial::setShininess(float shininess)
-    Sets the current shininess value to \a shininess.
- */
 void QNormalDiffuseMapMaterial::setShininess(float shininess)
 {
     Q_D(QNormalDiffuseMapMaterial);
     d->m_shininessParameter->setValue(shininess);
 }
 
-/*!
-    \fn Qt3D::QNormalDiffuseMapMaterial::setTextureScale(float textureScale)
-    Sets the current texture scale to \a textureScale.
- */
 void QNormalDiffuseMapMaterial::setTextureScale(float textureScale)
 {
     Q_D(QNormalDiffuseMapMaterial);
diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp
index b37ffa7aa..81e9ccd62 100644
--- a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp
+++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp
@@ -161,7 +161,6 @@ void QNormalDiffuseSpecularMapMaterialPrivate::init()
 */
 
 /*!
-    \fn Qt3D::QNormalDiffuseSpecularMapMaterial::QNormalDiffuseSpecularMapMaterial()
     Constructs a new Qt3D::QNormalDiffuseSpecularMapMaterial instance with parent object \a parent.
 */
 QNormalDiffuseSpecularMapMaterial::QNormalDiffuseSpecularMapMaterial(QNode *parent)
@@ -196,8 +195,9 @@ QNormalDiffuseSpecularMapMaterial::~QNormalDiffuseSpecularMapMaterial()
 }
 
 /*!
-    \fn Qt3D::QNormalDiffuseSpecularMapMaterial::ambient() const
-    \return the current QColor ambient value.
+    \property  NormalDiffuseSpecularMapMaterial::ambient
+
+    Holds the current QColor ambient value.
  */
 QColor QNormalDiffuseSpecularMapMaterial::ambient() const
 {
@@ -206,9 +206,11 @@ QColor QNormalDiffuseSpecularMapMaterial::ambient() const
 }
 
 /*!
-    \fn Qt3D::QNormalDiffuseSpecularMapMaterial::diffuse() const
-    \return the current diffuse map texture.
-    \b {Note:} By default the diffuse texture has a linear
+    \property *QNormalDiffuseSpecularMapMaterial::diffuse
+
+    Holds the current diffuse map texture.
+
+    \note By default the diffuse texture has a linear
     magnification filter, a linear mipmap linear minification filter,
     the wrap mode is repeat, the maximum anisotropy is set to 16.0
     and mipmapping is enabled.
@@ -220,9 +222,11 @@ QAbstractTextureProvider *QNormalDiffuseSpecularMapMaterial::diffuse() const
 }
 
 /*!
-    \fn Qt3D::QNormalDiffuseSpecularMapMaterial::normal() const
-    \return the current normal map texture.
-    \b {Note:} By default the normal texture has linear minification
+    \property QAbstractTextureProvider *QNormalDiffuseSpecularMapMaterial::normal
+
+    Holds the current normal map texture.
+
+    \note By default the normal texture has linear minification
     and magnification filters, the wrap mode is repeat and maximum anisotropy
     is set to 16.0.
  */
@@ -233,9 +237,11 @@ QAbstractTextureProvider *QNormalDiffuseSpecularMapMaterial::normal() const
 }
 
 /*!
-    \fn Qt3D::QNormalDiffuseSpecularMapMaterial::specular() const
-    \return the current specular map texture.
-    \b {Note:} By default the specular texture has a linear
+    \property *QNormalDiffuseSpecularMapMaterial::specular
+
+    Holds the current specular map texture.
+
+    \note By default the specular texture has a linear
     magnification filter, a linear mipmap linear minification filter,
     the wrap mode is repeat, the maximum anisotropy is set to 16.0
     and mipmapping is enabled.
@@ -247,8 +253,9 @@ QAbstractTextureProvider *QNormalDiffuseSpecularMapMaterial::specular() const
 }
 
 /*!
-    \fn Qt3D::QNormalDiffuseSpecularMapMaterial::shininess() const
-    \return the current shininess as a float value.
+    \property QNormalDiffuseSpecularMapMaterial::shininess
+
+    Holds the current shininess as a float value.
  */
 float QNormalDiffuseSpecularMapMaterial::shininess() const
 {
@@ -257,8 +264,9 @@ float QNormalDiffuseSpecularMapMaterial::shininess() const
 }
 
 /*!
-    \fn Qt3D::QNormalDiffuseSpecularMapMaterial::textureScale() const
-    \return the current texture scale.
+    \property QNormalDiffuseSpecularMapMaterial::textureScale
+
+    Holds the current texture scale.
  */
 float QNormalDiffuseSpecularMapMaterial::textureScale() const
 {
@@ -266,60 +274,36 @@ float QNormalDiffuseSpecularMapMaterial::textureScale() const
     return d->m_textureScaleParameter->value().toFloat();
 }
 
-/*!
-    \fn Qt3D::QNormalDiffuseSpecularMapMaterial::setAmbient(const QColor &ambient)
-    Sets the current ambient color to \a ambient
- */
 void QNormalDiffuseSpecularMapMaterial::setAmbient(const QColor &ambient)
 {
     Q_D(QNormalDiffuseSpecularMapMaterial);
     d->m_ambientParameter->setValue(ambient);
 }
 
-/*!
-    \fn Qt3D::QNormalDiffuseSpecularMapMaterial::setDiffuse(QTexture *diffuse)
-    Sets the current diffuse map to \a diffuse.
- */
 void QNormalDiffuseSpecularMapMaterial::setDiffuse(QAbstractTextureProvider *diffuse)
 {
     Q_D(QNormalDiffuseSpecularMapMaterial);
     d->m_diffuseParameter->setValue(QVariant::fromValue(diffuse));
 }
 
-/*!
-    \fn Qt3D::QNormalDiffuseSpecularMapMaterial::setNormal(QTexture *normal)
-    Sets the current normal map to \a normal.
- */
 void QNormalDiffuseSpecularMapMaterial::setNormal(QAbstractTextureProvider *normal)
 {
     Q_D(QNormalDiffuseSpecularMapMaterial);
     d->m_normalParameter->setValue(QVariant::fromValue(normal));
 }
 
-/*!
-    \fn Qt3D::QNormalDiffuseSpecularMapMaterial::setSpecular(QTexture *specular)
-    Sets the current specular map to \a specular.
- */
 void QNormalDiffuseSpecularMapMaterial::setSpecular(QAbstractTextureProvider *specular)
 {
     Q_D(QNormalDiffuseSpecularMapMaterial);
     d->m_specularParameter->setValue(QVariant::fromValue(specular));
 }
 
-/*!
-    \fn Qt3D::QNormalDiffuseSpecularMapMaterial::setShininess(float shininess)
-    Sets the current shininess value to \a shininess.
- */
 void QNormalDiffuseSpecularMapMaterial::setShininess(float shininess)
 {
     Q_D(QNormalDiffuseSpecularMapMaterial);
     d->m_shininessParameter->setValue(shininess);
 }
 
-/*!
-    \fn Qt3D::QNormalDiffuseSpecularMapMaterial::setTextureScale(float textureScale)
-    Sets the current texture scale to \a textureScale.
- */
 void QNormalDiffuseSpecularMapMaterial::setTextureScale(float textureScale)
 {
     Q_D(QNormalDiffuseSpecularMapMaterial);