diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-25 08:54:29 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-25 08:54:29 (GMT) |
| commit | df3691a0709af1706375772f5b68b0862ffb2d58 (patch) | |
| tree | f1c97dced5c6ee2a2efd1d3b6c1115674c885b8d | |
| parent | 864f6ce803b50740bf493092f939808e9e0a0c61 (diff) | |
| parent | 67ed18497705fa938728c505d165173dc5d3de68 (diff) | |
| download | Qt-df3691a0709af1706375772f5b68b0862ffb2d58.zip Qt-df3691a0709af1706375772f5b68b0862ffb2d58.tar.gz Qt-df3691a0709af1706375772f5b68b0862ffb2d58.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Flickable could flick in wrong direction if given too few touch samples
| -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 be10950..4a465cc 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); |