From c61b59a7d856b9c7783c87d2cccfc2ed913ef543 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Fri, 28 Aug 2009 16:56:05 +1000
Subject: Fix combined horizontal and vertical flicking

---
 src/declarative/fx/qfxflickable.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/declarative/fx/qfxflickable.cpp b/src/declarative/fx/qfxflickable.cpp
index 07df799..27bfa27 100644
--- a/src/declarative/fx/qfxflickable.cpp
+++ b/src/declarative/fx/qfxflickable.cpp
@@ -142,7 +142,7 @@ void QFxFlickablePrivate::flickX(qreal velocity)
             else
                 v = maxVelocity;
         }
-        _tl.clear();
+        _tl.reset(_moveX);
         _tl.accel(_moveX, v, 500, maxDistance);
         _tl.execute(fixupXEvent);
         if (!flicked) {
@@ -151,7 +151,7 @@ void QFxFlickablePrivate::flickX(qreal velocity)
             emit q->flickStarted();
         }
     } else {
-        _tl.clear();
+        _tl.reset(_moveX);
         fixupX();
     }
 }
@@ -178,7 +178,7 @@ void QFxFlickablePrivate::flickY(qreal velocity)
             else
                 v = maxVelocity;
         }
-        _tl.clear();
+        _tl.reset(_moveY);
         _tl.accel(_moveY, v, 500, maxDistance);
         _tl.execute(fixupYEvent);
         if (!flicked) {
@@ -187,7 +187,7 @@ void QFxFlickablePrivate::flickY(qreal velocity)
             emit q->flickStarted();
         }
     } else {
-        _tl.clear();
+        _tl.reset(_moveY);
         fixupY();
     }
 }
-- 
cgit v0.12