From: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Date: Tue, 22 Apr 2014 15:56:03 +0000 (+0200)
Subject: Append the start time of the current loop to the animation time.
X-Git-Tag: upstream/5.3.1~105
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=84cebba0c9beba4190372113856708558e406b38;p=platform%2Fupstream%2Fqtdeclarative.git

Append the start time of the current loop to the animation time.

currentTime() uses the total time, so when we use only the loop-local
time for the child animations, normal animations will seem to have
terminated long ago (on the previous loop).

Change-Id: I80a229f40a99569014d8082d153ad579c09fb9db
Reviewed-by: Michael Brasser <michael.brasser@live.com>
---

diff --git a/src/qml/animations/qparallelanimationgroupjob.cpp b/src/qml/animations/qparallelanimationgroupjob.cpp
index f3ea389..818988b 100644
--- a/src/qml/animations/qparallelanimationgroupjob.cpp
+++ b/src/qml/animations/qparallelanimationgroupjob.cpp
@@ -230,7 +230,7 @@ void QParallelAnimationGroupJob::uncontrolledAnimationFinished(QAbstractAnimatio
         maxDuration = qMax(maxDuration, job->totalDuration());
     }
 
-    setUncontrolledAnimationFinishTime(this, qMax(maxDuration, currentTime()));
+    setUncontrolledAnimationFinishTime(this, qMax(maxDuration + m_currentLoopStartTime, currentTime()));
 
     if (!running
             && ((m_direction == Forward && m_currentLoop == m_loopCount -1)