Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

2 files changed, 14 insertions, 3 deletions

diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index 08a7a28..dd4e1eb 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -791,6 +791,7 @@ void QmlColorAnimation::prepare(QmlMetaProperty &p)
     d->fromSourced = false;
     d->value.QmlTimeLineValue::setValue(0.);
     d->ca->setAnimValue(&d->value, QAbstractAnimation::KeepWhenStopped);
+    d->ca->setFromSourcedValue(&d->fromSourced);
 }
 
 QAbstractAnimation *QmlColorAnimation::qtAnimation()
@@ -1595,6 +1596,7 @@ void QmlNumericAnimation::prepare(QmlMetaProperty &p)
     d->fromSourced = false;
     d->value.QmlTimeLineValue::setValue(0.);
     d->na->setAnimValue(&d->value, QAbstractAnimation::KeepWhenStopped);
+    d->na->setFromSourcedValue(&d->fromSourced);
 }
 
 QAbstractAnimation *QmlNumericAnimation::qtAnimation()
@@ -2152,6 +2154,7 @@ void QmlVariantAnimation::prepare(QmlMetaProperty &p)
     d->fromSourced = false;
     d->value.QmlTimeLineValue::setValue(0.);
     d->va->setAnimValue(&d->value, QAbstractAnimation::KeepWhenStopped);
+    d->va->setFromSourcedValue(&d->fromSourced);
 }
 
 void QmlVariantAnimation::transition(QmlStateActions &actions,
diff --git a/src/declarative/util/qmlanimation_p.h b/src/declarative/util/qmlanimation_p.h
index 06b7c08..00937a6 100644
--- a/src/declarative/util/qmlanimation_p.h
+++ b/src/declarative/util/qmlanimation_p.h
@@ -116,8 +116,7 @@ private:
 class QmlTimeLineValueAnimator : public QVariantAnimation
 {
 public:
-    QmlTimeLineValueAnimator(QObject *parent = 0) : QVariantAnimation(parent), animValue(0), policy(KeepWhenStopped) {}
-    QmlTimeLineValueAnimator(QmlTimeLineValue *value, QObject *parent = 0) : QVariantAnimation(parent), animValue(value), policy(KeepWhenStopped) {}
+    QmlTimeLineValueAnimator(QObject *parent = 0) : QVariantAnimation(parent), animValue(0), fromSourced(0), policy(KeepWhenStopped) {}
     void setAnimValue(QmlTimeLineValue *value, DeletionPolicy p)
     {
         if (state() == Running)
@@ -125,6 +124,10 @@ public:
         animValue = value;
         policy = p;
     }
+    void setFromSourcedValue(bool *value)
+    {
+        fromSourced = value;
+    }
 protected:
     virtual void updateCurrentValue(const QVariant &value)
     {
@@ -134,7 +137,11 @@ protected:
     virtual void updateState(State oldState, State newState)
     {
         QVariantAnimation::updateState(oldState, newState);
-        if (newState == Stopped && policy == DeleteWhenStopped) {
+        if (newState == Running) {
+            //check for new from every loop
+            if (fromSourced)
+                *fromSourced = false;
+        } else if (newState == Stopped && policy == DeleteWhenStopped) {
             delete animValue;
             animValue = 0;
         }
@@ -142,6 +149,7 @@ protected:
 
 private:
     QmlTimeLineValue *animValue;
+    bool *fromSourced;
     DeletionPolicy policy;
 };