diff options
| author | Bea Lam <bea.lam@nokia.com> | 2009-10-27 07:52:59 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2009-10-27 07:52:59 (GMT) |
| commit | 719cf647346f8e81899c45914200fdea2b1b4e2b (patch) | |
| tree | b9ad9bf61533cec32e7cdff93b3117838cc65021 /src/declarative/fx/qfxflickable.h | |
| parent | 8f4b6a6cdd6243a4f099c5e8634d213629637709 (diff) | |
| parent | 3b2372c9dda9dbe6b6356d2c264e1b5b499c72a4 (diff) | |
| download | Qt-719cf647346f8e81899c45914200fdea2b1b4e2b.zip Qt-719cf647346f8e81899c45914200fdea2b1b4e2b.tar.gz Qt-719cf647346f8e81899c45914200fdea2b1b4e2b.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxflickable.h')
| -rw-r--r-- | src/declarative/fx/qfxflickable.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/fx/qfxflickable.h b/src/declarative/fx/qfxflickable.h index aaf4e0f..4c80e8f 100644 --- a/src/declarative/fx/qfxflickable.h +++ b/src/declarative/fx/qfxflickable.h @@ -67,6 +67,7 @@ class Q_DECLARATIVE_EXPORT QFxFlickable : public QFxItem Q_PROPERTY(bool overShoot READ overShoot WRITE setOverShoot) Q_PROPERTY(qreal maximumFlickVelocity READ maximumFlickVelocity WRITE setMaximumFlickVelocity) + Q_PROPERTY(qreal flickDeceleration READ flickDeceleration WRITE setFlickDeceleration) Q_PROPERTY(bool moving READ isMoving NOTIFY movingChanged) Q_PROPERTY(bool flicking READ isFlicking NOTIFY flickingChanged) @@ -118,6 +119,9 @@ public: qreal maximumFlickVelocity() const; void setMaximumFlickVelocity(qreal); + qreal flickDeceleration() const; + void setFlickDeceleration(qreal); + bool isInteractive() const; void setInteractive(bool); |