qiurui
/
qt3d
mirror of https://github.com/qt/qt3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Leena Miettinen 2018-09-24 18:05:06 +02:00
parent e879254613
commit 999424908f
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/doc/src/qmlextramaterials.qdoc
View File

@ -28,6 +28,8 @@
/*! /*!
\qmltype DiffuseMapMaterial \qmltype DiffuseMapMaterial
\inqmlmodule Qt3D.Extras \inqmlmodule Qt3D.Extras
\obsolete
\brief The DiffuseMapMaterial provides a default implementation of the phong lighting effect \brief The DiffuseMapMaterial provides a default implementation of the phong lighting effect
where the diffuse light component is read from a texture map. where the diffuse light component is read from a texture map.
\since 5.7 \since 5.7
@ -86,6 +88,8 @@
/*! /*!
\qmltype DiffuseSpecularMapMaterial \qmltype DiffuseSpecularMapMaterial
\inqmlmodule Qt3D.Extras \inqmlmodule Qt3D.Extras
\obsolete
\brief The DiffuseSpecularMapMaterial provides a default implementation of the phong lighting \brief The DiffuseSpecularMapMaterial provides a default implementation of the phong lighting
effect where the diffuse and specular light components are read from texture maps. effect where the diffuse and specular light components are read from texture maps.
\since 5.7 \since 5.7
@ -220,6 +224,8 @@
/*! /*!
\qmltype NormalDiffuseMapAlphaMaterial \qmltype NormalDiffuseMapAlphaMaterial
\inqmlmodule Qt3D.Extras \inqmlmodule Qt3D.Extras
\obsolete
\brief The NormalDiffuseMapAlphaMaterial provides a specialization of NormalDiffuseMapMaterial \brief The NormalDiffuseMapAlphaMaterial provides a specialization of NormalDiffuseMapMaterial
with alpha coverage and a depth test performed in the rendering pass. with alpha coverage and a depth test performed in the rendering pass.
\since 5.7 \since 5.7
@ -291,6 +297,8 @@
/*! /*!
\qmltype NormalDiffuseMapMaterial \qmltype NormalDiffuseMapMaterial
\inqmlmodule Qt3D.Extras \inqmlmodule Qt3D.Extras
\obsolete
\brief The NormalDiffuseMapMaterial provides a default implementation of the phong lighting \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 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. the mesh being rendered from a normal texture map.
@ -363,6 +371,8 @@
/*! /*!
\qmltype NormalDiffuseSpecularMapMaterial \qmltype NormalDiffuseSpecularMapMaterial
\inqmlmodule Qt3D.Extras \inqmlmodule Qt3D.Extras
\obsolete
\brief The NormalDiffuseSpecularMapMaterial provides a default implementation of the phong \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 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. maps and the normals of the mesh being rendered from a normal texture map.
@ -465,6 +475,8 @@
/*! /*!
\qmltype PhongAlphaMaterial \qmltype PhongAlphaMaterial
\inqmlmodule Qt3D.Extras \inqmlmodule Qt3D.Extras
\obsolete
\brief The PhongAlphaMaterial class provides a default implementation of \brief The PhongAlphaMaterial class provides a default implementation of
the phong lighting effect with alpha. the phong lighting effect with alpha.
\since 5.7 \since 5.7
@ -516,6 +528,8 @@
/*! /*!
\qmltype PhongMaterial \qmltype PhongMaterial
\inqmlmodule Qt3D.Extras \inqmlmodule Qt3D.Extras
\obsolete
\brief The PhongMaterial class provides a default implementation of the phong lighting effect. \brief The PhongMaterial class provides a default implementation of the phong lighting effect.
\since 5.7 \since 5.7
\inherits Qt3D.Render::Material \inherits Qt3D.Render::Material