diff options
author | Sami Merila <sami.merila@nokia.com> | 2010-08-27 11:15:05 (GMT) |
---|---|---|
committer | Sami Merila <sami.merila@nokia.com> | 2010-08-27 11:15:05 (GMT) |
commit | 287001fcd6d854b58bd61412e8b2c5bbdcb67b05 (patch) | |
tree | d78b4f109c9cce328dc5627de334f96b79331046 /src/imports | |
parent | 9ef61d3d1e53d32dc2568cbfb9f8ff5b19cb4ffc (diff) | |
parent | 8cb399e2c2ba47cdf3b27c7c5cb4d8d35702a068 (diff) | |
download | Qt-287001fcd6d854b58bd61412e8b2c5bbdcb67b05.zip Qt-287001fcd6d854b58bd61412e8b2c5bbdcb67b05.tar.gz Qt-287001fcd6d854b58bd61412e8b2c5bbdcb67b05.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/particles/qdeclarativeparticles.cpp | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/src/imports/particles/qdeclarativeparticles.cpp b/src/imports/particles/qdeclarativeparticles.cpp index 5cd9c0c..edb69bc 100644 --- a/src/imports/particles/qdeclarativeparticles.cpp +++ b/src/imports/particles/qdeclarativeparticles.cpp @@ -165,14 +165,6 @@ void QDeclarativeParticleMotion::destroy(QDeclarativeParticle &particle) It has no further properties. */ - -/*! - \internal - \class QDeclarativeParticleMotionLinear - \ingroup group_effects - \brief The QDeclarativeParticleMotionLinear class moves the particles linearly. -*/ - void QDeclarativeParticleMotionLinear::advance(QDeclarativeParticle &p, int interval) { p.x += interval * p.x_velocity; @@ -196,14 +188,6 @@ void QDeclarativeParticleMotionLinear::advance(QDeclarativeParticle &p, int inte */ /*! - \internal - \class QDeclarativeParticleMotionGravity - \ingroup group_effects - \brief The QDeclarativeParticleMotionGravity class moves the particles towards a point. - -*/ - -/*! \qmlproperty real ParticleMotionGravity::xattractor \qmlproperty real ParticleMotionGravity::yattractor These properties hold the x and y coordinates of the point attracting the particles. @@ -311,16 +295,6 @@ Rectangle { */ /*! - \internal - \class QDeclarativeParticleMotionWander - \ingroup group_effects - \brief The QDeclarativeParticleMotionWander class moves particles in a somewhat random fashion. - - The particles will continue roughly in the original direction, however will randomly - drift to each side. -*/ - -/*! \qmlproperty real ParticleMotionWander::xvariance \qmlproperty real ParticleMotionWander::yvariance @@ -709,13 +683,6 @@ Rectangle { \image particles.gif */ -/*! - \internal - \class QDeclarativeParticles - \ingroup group_effects - \brief The QDeclarativeParticles class generates and moves particles. -*/ - QDeclarativeParticles::QDeclarativeParticles(QDeclarativeItem *parent) : QDeclarativeItem(*(new QDeclarativeParticlesPrivate), parent) { |