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

1 files changed, 18 insertions, 0 deletions

diff --git a/tests/auto/declarative/states/tst_states.cpp b/tests/auto/declarative/states/tst_states.cpp
index 9d9cf07..3301048 100644
--- a/tests/auto/declarative/states/tst_states.cpp
+++ b/tests/auto/declarative/states/tst_states.cpp
@@ -70,6 +70,7 @@ private slots:
     void explicitChanges();
     void propertyErrors();
     void incorrectRestoreBug();
+    void autoStateAtStartupRestoreBug();
     void deletingChange();
     void deletingState();
     void tempState();
@@ -743,6 +744,23 @@ void tst_states::incorrectRestoreBug()
     QCOMPARE(rect->color(),QColor("green"));
 }
 
+void tst_states::autoStateAtStartupRestoreBug()
+{
+    QmlEngine engine;
+
+    QmlComponent component(&engine, SRCDIR "/data/autoStateAtStartupRestoreBug.qml");
+    QObject *obj = component.create();
+
+    QVERIFY(obj != 0);
+    QCOMPARE(obj->property("test").toInt(), 3);
+
+    obj->setProperty("input", 2);
+
+    QCOMPARE(obj->property("test").toInt(), 9);
+
+    delete obj;
+}
+
 void tst_states::deletingChange()
 {
     QmlEngine engine;