summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@qt.io>2017-08-14 13:54:31 +0200
committerNico Vertriest <nico.vertriest@qt.io>2017-08-30 11:40:36 +0000
commit235cb06b60f9fabb68957b72528352412faab7a7 (patch)
tree243a9267a6c9becb6ef89170f0bdc074870df735 /src
parentb28133bcb9aab23d687af57e250b3af155a6eede (diff)
Doc: add doc to undocumented methods/properties
qmorphphongmaterial.h:57: warning: No documentation for 'Qt3DExtras::QMorphPhongMaterial::interpolator' qextrudedtextmesh.cpp: No documentation for 'Qt3DExtras::QExtrudedTextMesh::depth', ::font and ::text qextrudedtextgeometry.h:79: warning: No documentation for 'Qt3DExtras::QExtrudedTextGeometry::indexAttribute', ::normalAttribute and ::text Change-Id: Ib6bb0310be3b9e3a735bb90194a79dfb295c258b Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/extras/3dtext/qextrudedtextgeometry.cpp10
-rw-r--r--src/extras/3dtext/qextrudedtextmesh.cpp12
-rw-r--r--src/extras/defaults/qforwardrenderer.cpp7
-rw-r--r--src/extras/defaults/qmorphphongmaterial.cpp5
4 files changed, 23 insertions, 11 deletions
diff --git a/src/extras/3dtext/qextrudedtextgeometry.cpp b/src/extras/3dtext/qextrudedtextgeometry.cpp
index 4a460bfc7..c4c4ba77f 100644
--- a/src/extras/3dtext/qextrudedtextgeometry.cpp
+++ b/src/extras/3dtext/qextrudedtextgeometry.cpp
@@ -433,7 +433,7 @@ void QExtrudedTextGeometry::setDepth(float depth)
}
/*!
- * \property QString QExtrudedTextGeometry::text
+ * \property QExtrudedTextGeometry::text
*
* Holds the text used for the mesh.
*/
@@ -444,7 +444,7 @@ QString QExtrudedTextGeometry::text() const
}
/*!
- * \property QFont QExtrudedTextGeometry::font
+ * \property QExtrudedTextGeometry::font
*
* Holds the font of the text.
*/
@@ -455,7 +455,7 @@ QFont QExtrudedTextGeometry::font() const
}
/*!
- * \property float QExtrudedTextGeometry::extrusionLength
+ * \property QExtrudedTextGeometry::extrusionLength
*
* Holds the extrusion length of the text.
*/
@@ -477,7 +477,7 @@ Qt3DRender::QAttribute *QExtrudedTextGeometry::positionAttribute() const
}
/*!
- * \property QExtrudedTextMesh::normalAttribute
+ * \property QExtrudedTextGeometry::normalAttribute
*
* Holds the geometry normal attribute.
*/
@@ -488,7 +488,7 @@ Qt3DRender::QAttribute *QExtrudedTextGeometry::normalAttribute() const
}
/*!
- * \property QExtrudedTextMesh::indexAttribute
+ * \property QExtrudedTextGeometry::indexAttribute
*
* Holds the geometry index attribute.
*/
diff --git a/src/extras/3dtext/qextrudedtextmesh.cpp b/src/extras/3dtext/qextrudedtextmesh.cpp
index 9d1dc7359..0c3394dea 100644
--- a/src/extras/3dtext/qextrudedtextmesh.cpp
+++ b/src/extras/3dtext/qextrudedtextmesh.cpp
@@ -63,19 +63,19 @@ namespace Qt3DExtras {
*/
/*!
- * \qmlproperty QString ExtrudedTextMesh::text
+ * \qmlproperty QString Qt3DExtras::ExtrudedTextMesh::text
*
* Holds the text used for the mesh.
*/
/*!
- * \qmlproperty QFont ExtrudedTextMesh::font
+ * \qmlproperty QFont Qt3DExtras::ExtrudedTextMesh::font
*
* Holds the font of the text.
*/
/*!
- * \qmlproperty float ExtrudedTextMesh::depth
+ * \qmlproperty float Qt3DExtras::ExtrudedTextMesh::depth
*
* Holds the extrusion depth of the text.
*/
@@ -123,7 +123,7 @@ void QExtrudedTextMesh::setDepth(float depth)
}
/*!
- * \property QString QExtrudedTextMesh::text
+ * \property QExtrudedTextMesh::text
*
* Holds the text used for the mesh.
*/
@@ -133,7 +133,7 @@ QString QExtrudedTextMesh::text() const
}
/*!
- * \property QFont QExtrudedTextMesh::font
+ * \property QExtrudedTextMesh::font
*
* Holds the font of the text.
*/
@@ -143,7 +143,7 @@ QFont QExtrudedTextMesh::font() const
}
/*!
- * \property float QExtrudedTextMesh::depth
+ * \property QExtrudedTextMesh::depth
*
* Holds the extrusion depth of the text.
*/
diff --git a/src/extras/defaults/qforwardrenderer.cpp b/src/extras/defaults/qforwardrenderer.cpp
index 3a5c6803b..f3137ea2d 100644
--- a/src/extras/defaults/qforwardrenderer.cpp
+++ b/src/extras/defaults/qforwardrenderer.cpp
@@ -270,6 +270,13 @@ QObject *QForwardRenderer::surface() const
return d->m_surfaceSelector->surface();
}
+/*!
+ \property QForwardRenderer::externalRenderTargetSize
+
+ Contains the size of the external render target. External render
+ targets are relevant when rendering does not target a window
+ surface (as set in \l {QForwardRenderer::surface()}{surface()}).
+*/
QSize QForwardRenderer::externalRenderTargetSize() const
{
Q_D(const QForwardRenderer);
diff --git a/src/extras/defaults/qmorphphongmaterial.cpp b/src/extras/defaults/qmorphphongmaterial.cpp
index 22f520de5..4b22e8765 100644
--- a/src/extras/defaults/qmorphphongmaterial.cpp
+++ b/src/extras/defaults/qmorphphongmaterial.cpp
@@ -250,6 +250,11 @@ float QMorphPhongMaterial::shininess() const
return d->m_shininessParameter->value().toFloat();
}
+/*!
+ \property QMorphPhongMaterial::interpolator
+
+ Contains the interpolation method of the Phong lighting effect.
+*/
float QMorphPhongMaterial::interpolator() const
{
Q_D(const QMorphPhongMaterial);