summaryrefslogtreecommitdiffstats
path: root/src/imports/particles
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-01 18:40:12 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-01 18:40:12 (GMT)
commit37e8fd4e09c1221efde3e67e6acd5cfbb35686fd (patch)
treec3c4a6cdeccff97e8b4ffb806a8b94f0c3f76919 /src/imports/particles
parentc272d672fc1863f9e3a201e93ad277c734749845 (diff)
parent09fcb3d479890c2f7acabf93b65ea3c09d8fe04e (diff)
downloadQt-37e8fd4e09c1221efde3e67e6acd5cfbb35686fd.zip
Qt-37e8fd4e09c1221efde3e67e6acd5cfbb35686fd.tar.gz
Qt-37e8fd4e09c1221efde3e67e6acd5cfbb35686fd.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (24 commits) Fix loading of _debug.dylib plugins under OSX. Remove strange binding loop in Repeater test. Improve Transform docs. Add media elements to the QML Elements docs. Doc fix typo Test cost of importing and resolving types (but not creating objects). Make QML 'hello world' tutorial less confusing. ModelNode::setObjectValue() must update the object cache. Doc improvements, fixes Remove references to deleted qmldebugger. Fix Rectangle::gradient rotation doc. Fix Flickable::visibleArea.xPosition, Flickable::visibleArea.yPosition docs import "." first - i.e. override it by everything else. Set positioner size to final size, rather than some random size mid animation Remove effects from element list. Fix imageprovider example compilation on Symbian arm Remove capability flag not available in public SDKs Fix plugin example compilation on Symbian arm Fix compilation on Symbian winscw ...
Diffstat (limited to 'src/imports/particles')
-rw-r--r--src/imports/particles/qdeclarativeparticles.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/particles/qdeclarativeparticles.cpp b/src/imports/particles/qdeclarativeparticles.cpp
index e69c235..e98a801 100644
--- a/src/imports/particles/qdeclarativeparticles.cpp
+++ b/src/imports/particles/qdeclarativeparticles.cpp
@@ -623,7 +623,7 @@ 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.
+ Particles are available in the \bold{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.