summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2018-09-24 18:05:06 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2018-09-25 07:50:52 +0000
commit999424908f17fa543baace39eb76a3c0ac89c7b5 (patch)
tree532e5de649194b9c1c63b5e593a16f628bb7cfec
parente879254613469b1b5290fca31ea69cb6ea407c06 (diff)
Doc: Mark deprecated Qt 3D QML types obsolete
The types will be listed on the "Obsolete QML Types" page that is linked from the "All QML Types" page. Task-number: QTBUG-69713 Change-Id: Ieff402d1cce426c0ce4b9191b8fe9b1dd02b4328 Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r--src/doc/src/qmlextramaterials.qdoc14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/doc/src/qmlextramaterials.qdoc b/src/doc/src/qmlextramaterials.qdoc
index 10198845f..c54cc948b 100644
--- a/src/doc/src/qmlextramaterials.qdoc
+++ b/src/doc/src/qmlextramaterials.qdoc
@@ -28,6 +28,8 @@
/*!
\qmltype DiffuseMapMaterial
\inqmlmodule Qt3D.Extras
+ \obsolete
+
\brief The DiffuseMapMaterial provides a default implementation of the phong lighting effect
where the diffuse light component is read from a texture map.
\since 5.7
@@ -86,6 +88,8 @@
/*!
\qmltype DiffuseSpecularMapMaterial
\inqmlmodule Qt3D.Extras
+ \obsolete
+
\brief The DiffuseSpecularMapMaterial provides a default implementation of the phong lighting
effect where the diffuse and specular light components are read from texture maps.
\since 5.7
@@ -220,6 +224,8 @@
/*!
\qmltype NormalDiffuseMapAlphaMaterial
\inqmlmodule Qt3D.Extras
+ \obsolete
+
\brief The NormalDiffuseMapAlphaMaterial provides a specialization of NormalDiffuseMapMaterial
with alpha coverage and a depth test performed in the rendering pass.
\since 5.7
@@ -291,6 +297,8 @@
/*!
\qmltype NormalDiffuseMapMaterial
\inqmlmodule Qt3D.Extras
+ \obsolete
+
\brief The NormalDiffuseMapMaterial provides a default implementation of the phong lighting
and bump effect where the diffuse light component is read from a texture map and the normals of
the mesh being rendered from a normal texture map.
@@ -363,6 +371,8 @@
/*!
\qmltype NormalDiffuseSpecularMapMaterial
\inqmlmodule Qt3D.Extras
+ \obsolete
+
\brief The NormalDiffuseSpecularMapMaterial provides a default implementation of the phong
lighting and bump effect where the diffuse and specular light components are read from texture
maps and the normals of the mesh being rendered from a normal texture map.
@@ -465,6 +475,8 @@
/*!
\qmltype PhongAlphaMaterial
\inqmlmodule Qt3D.Extras
+ \obsolete
+
\brief The PhongAlphaMaterial class provides a default implementation of
the phong lighting effect with alpha.
\since 5.7
@@ -516,6 +528,8 @@
/*!
\qmltype PhongMaterial
\inqmlmodule Qt3D.Extras
+ \obsolete
+
\brief The PhongMaterial class provides a default implementation of the phong lighting effect.
\since 5.7
\inherits Qt3D.Render::Material