diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-11-11 00:10:39 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-11-11 00:10:39 (GMT) |
| commit | f9f310dc3b479a3385e2154906463e8ba282befc (patch) | |
| tree | a64819a5c9196d4bc861240276c367ea1feab565 /src | |
| parent | 21a655fac8c491b2d76f2d8a82b93280ddaede23 (diff) | |
| parent | 24ee7d2fe5481658f350172b9c211bc3b4d89a65 (diff) | |
| download | Qt-f9f310dc3b479a3385e2154906463e8ba282befc.zip Qt-f9f310dc3b479a3385e2154906463e8ba282befc.tar.gz Qt-f9f310dc3b479a3385e2154906463e8ba282befc.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/util/qmlspringfollow.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/util/qmlspringfollow_p.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/util/qmlspringfollow.cpp b/src/declarative/util/qmlspringfollow.cpp index 4a7c8b3..d6961b0 100644 --- a/src/declarative/util/qmlspringfollow.cpp +++ b/src/declarative/util/qmlspringfollow.cpp @@ -55,7 +55,7 @@ class QmlSpringFollowPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QmlSpringFollow) public: QmlSpringFollowPrivate() - : sourceValue(0), maxVelocity(0), lastTime(0) + : currentValue(0), sourceValue(0), maxVelocity(0), lastTime(0) , mass(1.0), spring(0.), damping(0.), velocity(0), epsilon(0.01) , modulus(0.0), useMass(false), haveModulus(false), enabled(true), mode(Track), clock(this) {} diff --git a/src/declarative/util/qmlspringfollow_p.h b/src/declarative/util/qmlspringfollow_p.h index b81539a..b7989e4 100644 --- a/src/declarative/util/qmlspringfollow_p.h +++ b/src/declarative/util/qmlspringfollow_p.h @@ -64,7 +64,6 @@ class Q_DECLARATIVE_EXPORT QmlSpringFollow : public QObject, Q_PROPERTY(qreal spring READ spring WRITE setSpring) Q_PROPERTY(qreal damping READ damping WRITE setDamping) Q_PROPERTY(qreal epsilon READ epsilon WRITE setEpsilon) - Q_PROPERTY(qreal modulus READ modulus WRITE setModulus) Q_PROPERTY(bool enabled READ enabled WRITE setEnabled) Q_PROPERTY(qreal value READ value NOTIFY valueChanged) Q_PROPERTY(qreal modulus READ modulus WRITE setModulus NOTIFY modulusChanged) |