diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-01 21:10:46 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-01 21:10:46 (GMT) |
| commit | 6b3cd57ffd2646aa41f1509e64f949fc390a961f (patch) | |
| tree | 85c9aacfb9cf12fa69571c921e716ff692fdd9cc /src/imports/particles | |
| parent | 8603b43cccccf21ca042ab1ceed2f1ddd873d251 (diff) | |
| parent | 37e8fd4e09c1221efde3e67e6acd5cfbb35686fd (diff) | |
| download | Qt-6b3cd57ffd2646aa41f1509e64f949fc390a961f.zip Qt-6b3cd57ffd2646aa41f1509e64f949fc390a961f.tar.gz Qt-6b3cd57ffd2646aa41f1509e64f949fc390a961f.tar.bz2 | |
Merge remote branch 'origin/4.7' into HEAD
Conflicts:
demos/declarative/minehunt/minehunt.pro
Diffstat (limited to 'src/imports/particles')
| -rw-r--r-- | src/imports/particles/qdeclarativeparticles.cpp | 2 |
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. |