diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-25 16:05:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-25 16:05:33 (GMT) |
| commit | c09b481edd82942cdc85d138c2160004bd71a54e (patch) | |
| tree | b66f9772d73b61e61b001448f5567ed77055a389 /src/declarative/graphicsitems/qdeclarativeflickable.cpp | |
| parent | 5a4df38ac98aa013bcfaddc8470bc1a7bae4449e (diff) | |
| parent | df3691a0709af1706375772f5b68b0862ffb2d58 (diff) | |
| download | Qt-c09b481edd82942cdc85d138c2160004bd71a54e.zip Qt-c09b481edd82942cdc85d138c2160004bd71a54e.tar.gz Qt-c09b481edd82942cdc85d138c2160004bd71a54e.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeflickable.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflickable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp index ce7566b..13bb8ef 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp @@ -232,8 +232,8 @@ void QDeclarativeFlickablePrivate::AxisData::addVelocitySample(qreal v, qreal ma void QDeclarativeFlickablePrivate::AxisData::updateVelocity() { + velocity = 0; if (velocityBuffer.count() > QML_FLICK_DISCARDSAMPLES) { - velocity = 0; int count = velocityBuffer.count()-QML_FLICK_DISCARDSAMPLES; for (int i = 0; i < count; ++i) { qreal v = velocityBuffer.at(i); |