diff options
| -rw-r--r-- | doc/src/declarative/elements.qdoc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index bcabaccc00..1eea76772d 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -170,12 +170,20 @@ Elements that animate properties based on data types \endlist \section1 Graphical Effects +\section2 QtQuick 1.0 \list \o \l {Particles} - Generates and animates particles \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} \endlist +\section2 QtQuick 2.0 +\list +\o \l {ShaderEffect} - Allows GLSL shaders to be used as graphical effects +\o \l {ShaderEffectSource} - Usable as a texture in ShaderEffect +\o \l {GridMesh} - Generates a gird mesh of vertices for use by ShaderEffect +\o The \l{QtQuick.Particles 2} module provides a set of Particle System elements for QtQuick 2 +\endlist \section1 Add-On Elements These elements are not included in the \c{QtQuick 1.0} module. Their respective QML bindings @@ -318,6 +326,10 @@ should first be obtained and installed. \brief Elements for handling particle effects. + This is the QtQuick 1.0 particle system, incompatible with QtQuick 2.0 + + There is a completely separate \l{QtQuick.Particles 2}{QtQuick 2.0 particle system} + \generatelist{related} */ |