diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-10-28 00:21:01 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-10-28 00:21:01 (GMT) |
| commit | 01885076b037bdd6624744fe67b7de849f26fef3 (patch) | |
| tree | 9f78647a3e07c31c3dca359472e59fce50c387cf /src/declarative/fx/qfxflickable_p.h | |
| parent | d72970e54390f00be28efaac148b55f027a1eb69 (diff) | |
| parent | 5f9091771eaa26db5ad35e4788c13ac011512b61 (diff) | |
| download | Qt-01885076b037bdd6624744fe67b7de849f26fef3.zip Qt-01885076b037bdd6624744fe67b7de849f26fef3.tar.gz Qt-01885076b037bdd6624744fe67b7de849f26fef3.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxflickable_p.h')
| -rw-r--r-- | src/declarative/fx/qfxflickable_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/fx/qfxflickable_p.h b/src/declarative/fx/qfxflickable_p.h index 7224f21..07d66b8 100644 --- a/src/declarative/fx/qfxflickable_p.h +++ b/src/declarative/fx/qfxflickable_p.h @@ -70,8 +70,8 @@ class QFxFlickablePrivate : public QFxItemPrivate public: QFxFlickablePrivate(); void init(); - void flickX(qreal velocity); - void flickY(qreal velocity); + virtual void flickX(qreal velocity); + virtual void flickY(qreal velocity); virtual void fixupX(); virtual void fixupY(); void updateBeginningEnd(); @@ -106,6 +106,7 @@ public: QTime pressTime; QmlTimeLineEvent fixupXEvent; QmlTimeLineEvent fixupYEvent; + qreal deceleration; qreal maxVelocity; QTime velocityTime; QPointF lastFlickablePosition; |