diff options
author | Marko Niemelä <marko.a.niemela@nokia.com> | 2011-06-13 12:49:35 (GMT) |
---|---|---|
committer | Marko Niemelä <marko.a.niemela@nokia.com> | 2011-06-13 12:51:05 (GMT) |
commit | 3359984cd1f8e568feb42969830b3fb6a13f5718 (patch) | |
tree | 43e37c0431da93294a50af2b50bc1e4cd828a95b /doc | |
parent | 5f879c55e531165cc2569b03c3796d0f33d0a0b7 (diff) | |
download | Qt-3359984cd1f8e568feb42969830b3fb6a13f5718.zip Qt-3359984cd1f8e568feb42969830b3fb6a13f5718.tar.gz Qt-3359984cd1f8e568feb42969830b3fb6a13f5718.tar.bz2 |
Qmlshadersplugin API documentation enhancements.
Added a link from qml element index, removed some unnecessary doc markings, added missing example image and some other minor fixes.
Reviewed-by: Kim Gronholm
Diffstat (limited to 'doc')
-rw-r--r-- | doc/src/declarative/elements.qdoc | 13 | ||||
-rw-r--r-- | doc/src/declarative/pics/shaderexample.png | bin | 0 -> 3941 bytes |
2 files changed, 13 insertions, 0 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index a861a66..6b7a5fc 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -175,6 +175,8 @@ Elements that animate properties based on data types \o \l {ParticleMotionLinear} - Adds linear motion behavior to \l {Particles} \o \l {ParticleMotionGravity} - Adds gravitational motion to \l {Particles} \o \l {ParticleMotionWander} - Adds varied motions to \l {Particles} +\o \l {ShaderEffectItem} - Enables the use of OpenGL Shading Language together with QML +\o \l {ShaderEffectSource} - Encapsulates QML item tree as a source item for \l {ShaderEffectItem} \endlist \section1 Add-On Elements @@ -321,3 +323,14 @@ should first be obtained and installed. \generatelist{related} */ + +/*! + \group qml-shader-elements + \title QML Shader Elements + \ingroup qml-groups + + \brief Elements for using OpenGL shading language code together with the QML code. + + \generatelist{related} + +*/ diff --git a/doc/src/declarative/pics/shaderexample.png b/doc/src/declarative/pics/shaderexample.png Binary files differnew file mode 100644 index 0000000..dbc7291 --- /dev/null +++ b/doc/src/declarative/pics/shaderexample.png |