diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-19 11:51:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-19 11:51:17 (GMT) |
| commit | 7ac2e0cf47628c5a7ea08a5e3058c8bc55fbdd46 (patch) | |
| tree | a5e3ccd57f46c07999d37e300118ac269f2f1752 /src/imports | |
| parent | 78b2e9421c47371b68f4c65a181a077ba3a226ac (diff) | |
| parent | b6e74016305ea70ed36a7eb1504d3120106dbb23 (diff) | |
| download | Qt-7ac2e0cf47628c5a7ea08a5e3058c8bc55fbdd46.zip Qt-7ac2e0cf47628c5a7ea08a5e3058c8bc55fbdd46.tar.gz Qt-7ac2e0cf47628c5a7ea08a5e3058c8bc55fbdd46.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:
Initialize variable.
Setting stacking order from top to bottom seems to work better.
Don't crash if an out of bounds model index is accessed.
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/particles/qdeclarativeparticles_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/particles/qdeclarativeparticles_p.h b/src/imports/particles/qdeclarativeparticles_p.h index 993796d..9035e3e 100644 --- a/src/imports/particles/qdeclarativeparticles_p.h +++ b/src/imports/particles/qdeclarativeparticles_p.h @@ -111,7 +111,7 @@ class QDeclarativeParticleMotionWander : public QDeclarativeParticleMotion Q_OBJECT public: QDeclarativeParticleMotionWander() - : QDeclarativeParticleMotion(), particles(0), _xvariance(0), _yvariance(0) {} + : QDeclarativeParticleMotion(), particles(0), _xvariance(0), _yvariance(0), _pace(100) {} virtual void advance(QDeclarativeParticle &, int interval); virtual void created(QDeclarativeParticle &); |