From f2fc1355306219eaec9042462d3be4aceed1b829 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Thu, 24 Jun 2010 14:46:55 +1000
Subject: Prevent value source animations from being registered to start twice.

If the animation had an explicit "running: true", the animation would
be registered with the engine twice, which prevented a proper start.
---
 src/declarative/util/qdeclarativeanimation.cpp     |  2 ++
 .../qdeclarativeanimations/data/runningTrueBug.qml | 30 ++++++++++++++++++++++
 .../tst_qdeclarativeanimations.cpp                 | 15 +++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/runningTrueBug.qml

diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index f807866..add27f3 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -176,6 +176,8 @@ void QDeclarativeAbstractAnimation::setRunning(bool r)
 {
     Q_D(QDeclarativeAbstractAnimation);
     if (!d->componentComplete) {
+        if (d->running && r == d->running)    //don't re-register
+            return;
         d->running = r;
         if (r == false)
             d->avoidPropertyValueSourceStart = true;
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/runningTrueBug.qml b/tests/auto/declarative/qdeclarativeanimations/data/runningTrueBug.qml
new file mode 100644
index 0000000..2c5207e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/runningTrueBug.qml
@@ -0,0 +1,30 @@
+import Qt 4.7
+Rectangle {
+    color: "skyblue"
+    width: 500
+    height: 200
+    Rectangle {
+        objectName: "cloud"
+        color: "white"
+        y: 50
+        width: 100
+        height: 100
+
+        SequentialAnimation on x {
+            loops: Animation.Infinite
+            running: true
+            NumberAnimation {
+                id: firstAnimation
+                from: 0
+                to: 500
+                duration: 5000
+            }
+            NumberAnimation {
+                id: secondAnimation
+                from: -100
+                to: 0
+                duration: 1000
+            }
+        }
+    } 
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
index 5cf4c23..a965ef3 100644
--- a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
+++ b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
@@ -81,6 +81,7 @@ private slots:
     void dontStart();
     void easingProperties();
     void rotation();
+    void runningTrueBug();
 };
 
 #define QTIMED_COMPARE(lhs, rhs) do { \
@@ -733,6 +734,20 @@ void tst_qdeclarativeanimations::rotation()
     QTIMED_COMPARE(rr->rotation() + rr2->rotation() + rr3->rotation() + rr4->rotation(), qreal(370*4));
 }
 
+void tst_qdeclarativeanimations::runningTrueBug()
+{
+    //ensure we start correctly when "running: true" is explicitly set
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/runningTrueBug.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+    QVERIFY(rect);
+
+    QDeclarativeRectangle *cloud = rect->findChild<QDeclarativeRectangle*>("cloud");
+    QVERIFY(cloud);
+    QTest::qWait(1000);
+    QVERIFY(cloud->x() > qreal(0));
+}
+
 QTEST_MAIN(tst_qdeclarativeanimations)
 
 #include "tst_qdeclarativeanimations.moc"
-- 
cgit v0.12