summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2009-11-10 11:06:48 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2009-11-10 11:06:48 (GMT)
commit97cb8d856284efa7877c8127ad4e9ec2c02a6c7b (patch)
tree966fbec20969f6203e6240f75c490bf26a37e70e /src/declarative
parent7b42a443384c884ce12a9499a95455a188dcb02d (diff)
downloadQt-97cb8d856284efa7877c8127ad4e9ec2c02a6c7b.zip
Qt-97cb8d856284efa7877c8127ad4e9ec2c02a6c7b.tar.gz
Qt-97cb8d856284efa7877c8127ad4e9ec2c02a6c7b.tar.bz2
SpringFollow autotest
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/util/qmlspringfollow.cpp2
-rw-r--r--src/declarative/util/qmlspringfollow_p.h1
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)