1 files changed, 9 insertions, 0 deletions
diff --git a/src/declarative/fx/qfxflickable.cpp b/src/declarative/fx/qfxflickable.cpp
index 659193d..0fb8474 100644
--- a/src/declarative/fx/qfxflickable.cpp
+++ b/src/declarative/fx/qfxflickable.cpp
@@ -889,6 +889,14 @@ void QFxFlickable::viewportMoved()
     }
 }
 
+void QFxFlickable::cancelFlick()
+{
+    Q_D(QFxFlickable);
+    d->timeline.reset(d->_moveX);
+    d->timeline.reset(d->_moveY);
+    movementEnding();
+}
+
 void QFxFlickablePrivate::data_removeAt(int)
 {
     // ###
@@ -1257,6 +1265,7 @@ void QFxFlickable::movementEnding()
         emit flickEnded();
     }
     d->horizontalVelocity.setValue(0);
+    d->verticalVelocity.setValue(0);
 }
 
 void QFxFlickablePrivate::updateVelocity()