Hotfix docs

While QtQuick 1 and 2 aren't clearly separated yet, some of the more
drastic differences (like the separate particle systems) need to be
explained a little in the interim. Or at least visible.

Change-Id: I60321bcb90a34730ed3e0862a049540ea36f8c5b
Reviewed-on: http://codereview.qt-project.org/5044
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>

diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index bcabacc..1eea767 100644 (file)
--- 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}
 
 */