summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-03-26 00:06:23 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-03-26 00:06:23 (GMT)
commit1b10d66a05208ca24d12d062fd7c7d15a01df436 (patch)
tree69e89b146150acb533ef670573e0071e643efdb6
parentf75961dfd20b82f2f5e2a4b7feaf59c841a93f6b (diff)
downloadQt-1b10d66a05208ca24d12d062fd7c7d15a01df436.zip
Qt-1b10d66a05208ca24d12d062fd7c7d15a01df436.tar.gz
Qt-1b10d66a05208ca24d12d062fd7c7d15a01df436.tar.bz2
Document Particles module import.
-rw-r--r--doc/src/declarative/elements.qdoc1
-rw-r--r--src/imports/particles/qdeclarativeparticles.cpp5
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index e35d67c..e62d546 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -97,7 +97,6 @@ The following table lists the QML elements provided by the Qt Declarative module
\o
\list
-\o \l Script
\o \l Connections
\o \l Component
\o \l Timer
diff --git a/src/imports/particles/qdeclarativeparticles.cpp b/src/imports/particles/qdeclarativeparticles.cpp
index 83be59b..e69c235 100644
--- a/src/imports/particles/qdeclarativeparticles.cpp
+++ b/src/imports/particles/qdeclarativeparticles.cpp
@@ -623,6 +623,8 @@ void QDeclarativeParticlesPrivate::updateOpacity(QDeclarativeParticle &p, int ag
\brief The Particles object generates and moves particles.
\inherits Item
+ Particles are available in the Qt.labs.particles 1.0 module.
+
This element provides preliminary support for particles in QML,
and may be heavily changed or removed in later versions.
@@ -640,6 +642,9 @@ void QDeclarativeParticlesPrivate::updateOpacity(QDeclarativeParticle &p, int ag
snow, the lower one has particles expelled up like a fountain.
\qml
+import Qt 4.6
+import Qt.labs.particles 1.0
+
Rectangle {
width: 240
height: 320