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

author: Michael Brasser <michael.brasser@nokia.com> 2009-05-22 01:11:46 (GMT)
committer: Michael Brasser <michael.brasser@nokia.com> 2009-05-22 01:11:46 (GMT)
commit: 47318932fc44428fc698fc5d4366e9b59f5c7fb9 (patch)
tree: 7357009416021728fcf1bb3163f0841cc7e946e9 /tests/auto/declarative
parent: 61943383ccff409d60d9837d58e4372dc6f22f23 (diff)
parent: 5a506eefe1ca8f654dcfc354f8ac39547510becf (diff)
download: Qt-47318932fc44428fc698fc5d4366e9b59f5c7fb9.zip
Qt-47318932fc44428fc698fc5d4366e9b59f5c7fb9.tar.gz
Qt-47318932fc44428fc698fc5d4366e9b59f5c7fb9.tar.bz2
87 files changed, 1847 insertions, 666 deletions
diff --git a/tests/auto/declarative/listview/tst_listview.cpp b/tests/auto/declarative/listview/tst_listview.cpp
index 25f546a..8cf0a85 100644
--- a/tests/auto/declarative/listview/tst_listview.cpp
+++ b/tests/auto/declarative/listview/tst_listview.cpp
@@ -169,7 +169,7 @@ tst_QFxListView::tst_QFxListView()
 template <class T>
 void tst_QFxListView::items()
 {
-    QFxView *canvas = createView(SRCDIR "/data/listview.xml");
+    QFxView *canvas = createView(SRCDIR "/data/listview.qml");
 
     T model;
     model.addItem("Fred", "12345");
@@ -205,7 +205,7 @@ void tst_QFxListView::items()
 template <class T>
 void tst_QFxListView::changed()
 {
-    QFxView *canvas = createView(SRCDIR "/data/listview.xml");
+    QFxView *canvas = createView(SRCDIR "/data/listview.qml");
 
     T model;
     model.addItem("Fred", "12345");
@@ -238,7 +238,7 @@ void tst_QFxListView::changed()
 template <class T>
 void tst_QFxListView::inserted()
 {
-    QFxView *canvas = createView(SRCDIR "/data/listview.xml");
+    QFxView *canvas = createView(SRCDIR "/data/listview.qml");
 
     T model;
     model.addItem("Fred", "12345");
@@ -305,7 +305,7 @@ void tst_QFxListView::inserted()
 template <class T>
 void tst_QFxListView::removed()
 {
-    QFxView *canvas = createView(SRCDIR "/data/listview.xml");
+    QFxView *canvas = createView(SRCDIR "/data/listview.qml");
 
     T model;
     for (int i = 0; i < 30; i++)
@@ -445,8 +445,8 @@ QFxView *tst_QFxListView::createView(const QString &filename)
 
     QFile file(filename);
     file.open(QFile::ReadOnly);
-    QString xml = file.readAll();
-    canvas->setQml(xml, filename);
+    QString qml = file.readAll();
+    canvas->setQml(qml, filename);
 
     return canvas;
 }
@@ -459,8 +459,10 @@ template<typename T>
 T *tst_QFxListView::findItem(QFxItem *parent, const QString &id, int index)
 {
     const QMetaObject &mo = T::staticMetaObject;
+    qDebug() << parent->children()->count() << "children";
     for (int i = 0; i < parent->children()->count(); ++i) {
         QFxItem *item = parent->children()->at(i);
+        qDebug() << "try" << item;
         if (mo.cast(item) && (id.isEmpty() || item->id() == id)) {
             if (index != -1) {
                 QmlExpression e(qmlContext(item), "index", item);
diff --git a/tests/auto/declarative/visual/ListView/basic1/basic1.qml b/tests/auto/declarative/visual/ListView/basic1/basic1.qml
new file mode 100644
index 0000000..d9cd030
--- /dev/null
+++ b/tests/auto/declarative/visual/ListView/basic1/basic1.qml
@@ -0,0 +1,25 @@
+Rect {
+    color: "blue"
+    width: 200
+    height: 300
+    id: Page
+    ListView {
+        anchors.fill: parent
+        delegate: Rect {
+            color: "red"
+            width: 100
+            height: 100
+            Text {
+                text: name
+            }
+        }
+        model: ListModel {
+            ListElement {
+                name: "January"
+            }
+            ListElement {
+                name: "February"
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/visual/ListView/basic1/basic1.xml b/tests/auto/declarative/visual/ListView/basic1/basic1.xml
deleted file mode 100644
index 5038c0a..0000000
--- a/tests/auto/declarative/visual/ListView/basic1/basic1.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Rect color="blue" width="800" height="600" id="Page">
-    <ListView anchors.fill="{parent}">
-        <delegate>
-            <Rect color="red" width="100" height="100">
-                <Text text="{name}" />
-            </Rect>
-        </delegate>
-        <model>
-            <ListModel>
-                <Month>
-                    <name>January</name>
-                </Month>
-                <Month>
-                    <name>February</name>
-                </Month>
-            </ListModel>
-        </model>
-    </ListView>
-</Rect>
diff --git a/tests/auto/declarative/visual/ListView/basic1/data/opengl/image0.png b/tests/auto/declarative/visual/ListView/basic1/data/opengl/image0.png
deleted file mode 100644
index 403b407..0000000
--- a/tests/auto/declarative/visual/ListView/basic1/data/opengl/image0.png
+++ /dev/null
diff --git a/tests/auto/declarative/visual/ListView/basic1/data/opengl/manifest.xml b/tests/auto/declarative/visual/ListView/basic1/data/opengl/manifest.xml
deleted file mode 100644
index b784f42..0000000
--- a/tests/auto/declarative/visual/ListView/basic1/data/opengl/manifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestLog>
-    <TestFullFrame time="30" frameId="0"/>
-</TestLog>
diff --git a/tests/auto/declarative/visual/ListView/basic1/data/raster/image0.png b/tests/auto/declarative/visual/ListView/basic1/data/raster/image0.png
new file mode 100644
index 0000000..f8a4830
--- /dev/null
+++ b/tests/auto/declarative/visual/ListView/basic1/data/raster/image0.png
diff --git a/tests/auto/declarative/visual/ListView/basic1/data/raster/manifest.qml b/tests/auto/declarative/visual/ListView/basic1/data/raster/manifest.qml
new file mode 100644
index 0000000..6d900f5
--- /dev/null
+++ b/tests/auto/declarative/visual/ListView/basic1/data/raster/manifest.qml
@@ -0,0 +1,6 @@
+TestLog {
+    TestFullFrame {
+        time: 0
+        frameId: 0
+        }
+}
diff --git a/tests/auto/declarative/visual/ListView/basic1/test b/tests/auto/declarative/visual/ListView/basic1/test
index 62f0665..49fcf5a 100644
--- a/tests/auto/declarative/visual/ListView/basic1/test
+++ b/tests/auto/declarative/visual/ListView/basic1/test
@@ -1 +1 @@
-basic1.xml
+basic1.qml
diff --git a/tests/auto/declarative/visual/ListView/basic2/basic2.qml b/tests/auto/declarative/visual/ListView/basic2/basic2.qml
new file mode 100644
index 0000000..e5996cf
--- /dev/null
+++ b/tests/auto/declarative/visual/ListView/basic2/basic2.qml
@@ -0,0 +1,29 @@
+Rect {
+    color: "blue"
+    width: 200
+    height: 300
+    id: Page
+    Component {
+        id: Delegate
+        Rect {
+            color: "red"
+            width: 100
+            height: 100
+            Text {
+                text: name
+            }
+        }
+    }
+    ListView {
+        anchors.fill: parent
+        delegate: Delegate
+        model: ListModel {
+            ListElement {
+                name: "January"
+            }
+            ListElement {
+                name: "February"
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/visual/ListView/basic2/basic2.xml b/tests/auto/declarative/visual/ListView/basic2/basic2.xml
deleted file mode 100644
index 5e139fe..0000000
--- a/tests/auto/declarative/visual/ListView/basic2/basic2.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Rect color="blue" width="800" height="600" id="Page">
-    <Component id="Delegate">
-        <Rect color="red" width="100" height="100">
-            <Text text="{name}" />
-        </Rect>
-    </Component>
-
-    <ListView anchors.fill="{parent}" delegate="{Delegate}">
-        <model>
-            <ListModel>
-                <Month>
-                    <name>January</name>
-                </Month>
-                <Month>
-                    <name>February</name>
-                </Month>
-            </ListModel>
-        </model>
-    </ListView>
-</Rect>
diff --git a/tests/auto/declarative/visual/ListView/basic2/data/opengl/image0.png b/tests/auto/declarative/visual/ListView/basic2/data/opengl/image0.png
deleted file mode 100644
index 403b407..0000000
--- a/tests/auto/declarative/visual/ListView/basic2/data/opengl/image0.png
+++ /dev/null
diff --git a/tests/auto/declarative/visual/ListView/basic2/data/opengl/manifest.xml b/tests/auto/declarative/visual/ListView/basic2/data/opengl/manifest.xml
deleted file mode 100644
index f3fa6c9..0000000
--- a/tests/auto/declarative/visual/ListView/basic2/data/opengl/manifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestLog>
-    <TestFullFrame time="31" frameId="0"/>
-</TestLog>
diff --git a/tests/auto/declarative/visual/ListView/basic2/data/raster/image0.png b/tests/auto/declarative/visual/ListView/basic2/data/raster/image0.png
new file mode 100644
index 0000000..f8a4830
--- /dev/null
+++ b/tests/auto/declarative/visual/ListView/basic2/data/raster/image0.png
diff --git a/tests/auto/declarative/visual/ListView/basic2/data/raster/manifest.qml b/tests/auto/declarative/visual/ListView/basic2/data/raster/manifest.qml
new file mode 100644
index 0000000..6d900f5
--- /dev/null
+++ b/tests/auto/declarative/visual/ListView/basic2/data/raster/manifest.qml
@@ -0,0 +1,6 @@
+TestLog {
+    TestFullFrame {
+        time: 0
+        frameId: 0
+        }
+}
diff --git a/tests/auto/declarative/visual/ListView/basic2/test b/tests/auto/declarative/visual/ListView/basic2/test
index ae974fe..eb79495 100644
--- a/tests/auto/declarative/visual/ListView/basic2/test
+++ b/tests/auto/declarative/visual/ListView/basic2/test
@@ -1 +1 @@
-basic2.xml
+basic2.qml
diff --git a/tests/auto/declarative/visual/ListView/basic3/basic3.qml b/tests/auto/declarative/visual/ListView/basic3/basic3.qml
new file mode 100644
index 0000000..98aa5fb
--- /dev/null
+++ b/tests/auto/declarative/visual/ListView/basic3/basic3.qml
@@ -0,0 +1,27 @@
+Rect {
+    color: "blue"
+    width: 200
+    height: 300
+    id: Page
+    ListModel {
+        id: Model
+        ListElement {
+            name: "January"
+        }
+        ListElement {
+            name: "February"
+        }
+    }
+    ListView {
+        anchors.fill: parent
+        model: Model
+        delegate: Rect {
+            color: "red"
+            width: 100
+            height: 100
+            Text {
+                text: name
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/visual/ListView/basic3/basic3.xml b/tests/auto/declarative/visual/ListView/basic3/basic3.xml
deleted file mode 100644
index a587b82..0000000
--- a/tests/auto/declarative/visual/ListView/basic3/basic3.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Rect color="blue" width="800" height="600" id="Page">
-    <ListModel id="Model">
-        <Month>
-            <name>January</name>
-        </Month>
-        <Month>
-            <name>February</name>
-        </Month>
-    </ListModel>
-
-    <ListView anchors.fill="{parent}" model="{Model}">
-        <delegate>
-            <Rect color="red" width="100" height="100">
-                <Text text="{name}" />
-            </Rect>
-        </delegate>
-    </ListView>
-</Rect>
diff --git a/tests/auto/declarative/visual/ListView/basic3/data/opengl/image0.png b/tests/auto/declarative/visual/ListView/basic3/data/opengl/image0.png
deleted file mode 100644
index 403b407..0000000
--- a/tests/auto/declarative/visual/ListView/basic3/data/opengl/image0.png
+++ /dev/null
diff --git a/tests/auto/declarative/visual/ListView/basic3/data/opengl/manifest.xml b/tests/auto/declarative/visual/ListView/basic3/data/opengl/manifest.xml
deleted file mode 100644
index b784f42..0000000
--- a/tests/auto/declarative/visual/ListView/basic3/data/opengl/manifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestLog>
-    <TestFullFrame time="30" frameId="0"/>
-</TestLog>
diff --git a/tests/auto/declarative/visual/ListView/basic3/data/raster/image0.png b/tests/auto/declarative/visual/ListView/basic3/data/raster/image0.png
new file mode 100644
index 0000000..f8a4830
--- /dev/null
+++ b/tests/auto/declarative/visual/ListView/basic3/data/raster/image0.png
diff --git a/tests/auto/declarative/visual/ListView/basic3/data/raster/manifest.qml b/tests/auto/declarative/visual/ListView/basic3/data/raster/manifest.qml
new file mode 100644
index 0000000..6d900f5
--- /dev/null
+++ b/tests/auto/declarative/visual/ListView/basic3/data/raster/manifest.qml
@@ -0,0 +1,6 @@
+TestLog {
+    TestFullFrame {
+        time: 0
+        frameId: 0
+        }
+}
diff --git a/tests/auto/declarative/visual/ListView/basic3/test b/tests/auto/declarative/visual/ListView/basic3/test
index ea3154e..9ec306b 100644
--- a/tests/auto/declarative/visual/ListView/basic3/test
+++ b/tests/auto/declarative/visual/ListView/basic3/test
@@ -1 +1 @@
-basic3.xml
+basic3.qml
diff --git a/tests/auto/declarative/visual/ListView/basic4/basic4.qml b/tests/auto/declarative/visual/ListView/basic4/basic4.qml
new file mode 100644
index 0000000..9e5229a
--- /dev/null
+++ b/tests/auto/declarative/visual/ListView/basic4/basic4.qml
@@ -0,0 +1,31 @@
+Rect {
+    color: "blue"
+    width: 200
+    height: 300
+    id: Page
+    ListModel {
+        id: Model
+        ListElement {
+            name: "January"
+        }
+        ListElement {
+            name: "February"
+        }
+    }
+    Component {
+        id: Delegate
+        Rect {
+            color: "red"
+            width: 100
+            height: 100
+            Text {
+                text: name
+            }
+        }
+    }
+    ListView {
+        anchors.fill: parent
+        model: Model
+        delegate: Delegate
+    }
+}
diff --git a/tests/auto/declarative/visual/ListView/basic4/basic4.xml b/tests/auto/declarative/visual/ListView/basic4/basic4.xml
deleted file mode 100644
index 4b9201c..0000000
--- a/tests/auto/declarative/visual/ListView/basic4/basic4.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Rect color="blue" width="800" height="600" id="Page">
-    <ListModel id="Model">
-        <Month>
-            <name>January</name>
-        </Month>
-        <Month>
-            <name>February</name>
-        </Month>
-    </ListModel>
-
-    <Component id="Delegate">
-        <Rect color="red" width="100" height="100">
-            <Text text="{name}" />
-        </Rect>
-    </Component>
-
-    <ListView anchors.fill="{parent}" model="{Model}" delegate="{Delegate}">
-    </ListView>
-</Rect>
diff --git a/tests/auto/declarative/visual/ListView/basic4/data/opengl/image0.png b/tests/auto/declarative/visual/ListView/basic4/data/opengl/image0.png
deleted file mode 100644
index 403b407..0000000
--- a/tests/auto/declarative/visual/ListView/basic4/data/opengl/image0.png
+++ /dev/null
diff --git a/tests/auto/declarative/visual/ListView/basic4/data/opengl/manifest.xml b/tests/auto/declarative/visual/ListView/basic4/data/opengl/manifest.xml
deleted file mode 100644
index b784f42..0000000
--- a/tests/auto/declarative/visual/ListView/basic4/data/opengl/manifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestLog>
-    <TestFullFrame time="30" frameId="0"/>
-</TestLog>
diff --git a/tests/auto/declarative/visual/ListView/basic4/data/raster/image0.png b/tests/auto/declarative/visual/ListView/basic4/data/raster/image0.png
new file mode 100644
index 0000000..f8a4830
--- /dev/null
+++ b/tests/auto/declarative/visual/ListView/basic4/data/raster/image0.png
diff --git a/tests/auto/declarative/visual/ListView/basic4/data/raster/manifest.qml b/tests/auto/declarative/visual/ListView/basic4/data/raster/manifest.qml
new file mode 100644
index 0000000..6d900f5
--- /dev/null
+++ b/tests/auto/declarative/visual/ListView/basic4/data/raster/manifest.qml
@@ -0,0 +1,6 @@
+TestLog {
+    TestFullFrame {
+        time: 0
+        frameId: 0
+        }
+}
diff --git a/tests/auto/declarative/visual/ListView/basic4/test b/tests/auto/declarative/visual/ListView/basic4/test
index 891e0be..2a7f227 100644
--- a/tests/auto/declarative/visual/ListView/basic4/test
+++ b/tests/auto/declarative/visual/ListView/basic4/test
@@ -1 +1 @@
-basic4.xml
+basic4.qml
diff --git a/tests/auto/declarative/visual/bindinganimation/bindinganimation.qml b/tests/auto/declarative/visual/bindinganimation/bindinganimation.qml
new file mode 100644
index 0000000..61cedc2
--- /dev/null
+++ b/tests/auto/declarative/visual/bindinganimation/bindinganimation.qml
@@ -0,0 +1,40 @@
+Rect {
+    color: "blue"
+    width: 320
+    height: 240
+    id: Page
+    Rect {
+        id: MyRect
+        width: 100
+        height: 100
+        color: "red"
+        x: 10
+    }
+    states: [
+        State {
+            name: "hello"
+            SetProperty {
+                target: MyRect
+                property: "x"
+                binding: 100
+            }
+            SetProperty {
+                target: MyMouseRegion
+                property: "onClicked"
+                value: "Page.currentState = ''"
+            }
+        }
+    ]
+    transitions: [
+        Transition {
+            NumericAnimation {
+                properties: "x"
+            }
+        }
+    ]
+    MouseRegion {
+        id: MyMouseRegion
+        anchors.fill: parent
+        onClicked: { Page.state= 'hello' }
+    }
+}
diff --git a/tests/auto/declarative/visual/bindinganimation/bindinganimation.xml b/tests/auto/declarative/visual/bindinganimation/bindinganimation.xml
deleted file mode 100644
index 30b0b6a..0000000
--- a/tests/auto/declarative/visual/bindinganimation/bindinganimation.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Rect color="blue" width="320" height="240" id="Page">
-    <Rect id="MyRect" width="100" height="100" color="red" x="{10}" />
-
-    <states>
-        <State name="hello">
-            <SetProperty target="{MyRect}" property="x" binding="100" />
-            <SetProperty target="{MyMouseRegion}" property="onClick" value="Page.currentState = ''" />
-        </State>
-    </states>
-
-    <transitions>
-        <Transition>
-            <NumericAnimation properties="x" />
-        </Transition>
-    </transitions>
-
-    <MouseRegion id="MyMouseRegion" anchors.fill="{parent}" onClick="Page.currentState= 'hello'" />
-
-</Rect>
diff --git a/tests/auto/declarative/visual/bindinganimation/data/opengl/manifest-play.xml b/tests/auto/declarative/visual/bindinganimation/data/opengl/manifest-play.xml
deleted file mode 100644
index 6c5856f..0000000
--- a/tests/auto/declarative/visual/bindinganimation/data/opengl/manifest-play.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestLog>
-    <TestFullFrame time="30" frameId="0"/>
-    <TestMouse time="1770" type="2" button="1" buttons="1" globalPos="614,528" pos="175,131"/>
-    <TestMouse time="1860" type="3" button="1" buttons="0" globalPos="614,528" pos="175,131"/>
-    <TestFrame time="1860" hash="7CB5FC371040E587DE9F06CE14A4B29A"/>
-    <TestFrame time="1920" hash="8F88EE8780C32F038C9ACDC7172DE04E"/>
-    <TestFrame time="1950" hash="BE859D598C5DB953A8FC506DED4940EB"/>
-    <TestFrame time="1980" hash="16FE17B15900FF0464AB20EA921E5B1F"/>
-    <TestFrame time="2010" hash="FCB17070EF24575C61046928A8BBE440"/>
-    <TestFrame time="2040" hash="4F58226BDBDA7339D972ECA065F75766"/>
-    <TestFrame time="2070" hash="D9AF30557F99B086BB1A185A946B580D"/>
-    <TestFrame time="2100" hash="082E0E7650D187A54EF0948CCCA98E5A"/>
-    <TestFrame time="2130" hash="4F41101378A104E72228EEB4BA395CA8"/>
-    <TestFrame time="2160" hash="3223ED179C828FADB3ECA9C6373176C1"/>
-    <TestFrame time="2190" hash="DAFCCE427161A70C3513841AC22AEA00"/>
-    <TestFrame time="2220" hash="7F465A99FCA50503736E470A0B4E1C7A"/>
-    <TestFrame time="2250" hash="97542160B249135B1F3957DBBB329C2E"/>
-    <TestFrame time="2280" hash="F9F74A2E38B52C9266F33E428B6ACD9D"/>
-    <TestFrame time="2310" hash="65AD7E0189C096792331BD1BB0DAF0DB"/>
-    <TestFrame time="2340" hash="BA403842BA3128B1CDF6A9CB28C90751"/>
-    <TestFrame time="2370" hash="1BCDCD0E8166D69F4349E05D5E92FD9D"/>
-    <TestFrame time="2400" hash="383BA6B9EFCC58FCA512982A207631F6"/>
-    <TestMouse time="2820" type="2" button="1" buttons="1" globalPos="614,528" pos="175,131"/>
-    <TestMouse time="2910" type="3" button="1" buttons="0" globalPos="614,528" pos="175,131"/>
-    <TestFrame time="2910" hash="383BA6B9EFCC58FCA512982A207631F6"/>
-    <TestFrame time="2970" hash="ADC501A3A2B8AAF72F58BA985B57424E"/>
-    <TestFrame time="3000" hash="BFA51B7C19753EF7B16D78AFFFC7B9DD"/>
-    <TestFrame time="3030" hash="A93F930EC8528F954CD4A770C9A8171B"/>
-    <TestFrame time="3060" hash="0B0C6419E1E5B016D9C22BD98FD452B1"/>
-    <TestFrame time="3090" hash="1D5CD86AB732DA3705A7BB1DEAB77923"/>
-    <TestFrame time="3120" hash="69058485CED6BC992A1A7C5EE34ADD4C"/>
-    <TestFrame time="3150" hash="72731478D80F024076EA639B55152360"/>
-    <TestFrame time="3180" hash="37739777A5979F3EBF85E47E63341660"/>
-    <TestFrame time="3210" hash="FCAE0317F81A3DDD713F4DB1349A9DA0"/>
-    <TestFrame time="3240" hash="82363265ED2B611A54F8D48B2AF22F11"/>
-    <TestFrame time="3270" hash="5FAE0BDC65C609CB766CE585B8C649DB"/>
-    <TestFrame time="3300" hash="2D21B4AF3780EF2BBCCFCEC957CE49C8"/>
-    <TestFrame time="3330" hash="4AB21E266919FB8D340F87091D8E1F62"/>
-    <TestFrame time="3360" hash="5F5DA43901938FA244F536336FFD2DFC"/>
-    <TestFrame time="3390" hash="9B7685F5933C5E06883EE4D1BB2BD2C6"/>
-    <TestFrame time="3420" hash="96C077E3A572EDFF04FA9B2F7020FFD0"/>
-    <TestFrame time="3450" hash="7CB5FC371040E587DE9F06CE14A4B29A"/>
-    <TestMouse time="3840" type="2" button="1" buttons="1" globalPos="614,528" pos="175,131"/>
-    <TestMouse time="3930" type="3" button="1" buttons="0" globalPos="614,528" pos="175,131"/>
-    <TestFrame time="3930" hash="7CB5FC371040E587DE9F06CE14A4B29A"/>
-    <TestFrame time="3990" hash="8F88EE8780C32F038C9ACDC7172DE04E"/>
-    <TestFrame time="4020" hash="BE859D598C5DB953A8FC506DED4940EB"/>
-    <TestFrame time="4050" hash="16FE17B15900FF0464AB20EA921E5B1F"/>
-    <TestFrame time="4080" hash="FCB17070EF24575C61046928A8BBE440"/>
-    <TestFrame time="4110" hash="4F58226BDBDA7339D972ECA065F75766"/>
-    <TestFrame time="4140" hash="D9AF30557F99B086BB1A185A946B580D"/>
-    <TestFrame time="4170" hash="082E0E7650D187A54EF0948CCCA98E5A"/>
-    <TestFrame time="4200" hash="4F41101378A104E72228EEB4BA395CA8"/>
-    <TestFrame time="4230" hash="3223ED179C828FADB3ECA9C6373176C1"/>
-    <TestFrame time="4260" hash="DAFCCE427161A70C3513841AC22AEA00"/>
-    <TestFrame time="4290" hash="7F465A99FCA50503736E470A0B4E1C7A"/>
-    <TestFrame time="4320" hash="97542160B249135B1F3957DBBB329C2E"/>
-    <TestFrame time="4350" hash="F9F74A2E38B52C9266F33E428B6ACD9D"/>
-    <TestFrame time="4380" hash="65AD7E0189C096792331BD1BB0DAF0DB"/>
-    <TestFrame time="4410" hash="BA403842BA3128B1CDF6A9CB28C90751"/>
-    <TestFrame time="4440" hash="1BCDCD0E8166D69F4349E05D5E92FD9D"/>
-    <TestFrame time="4470" hash="383BA6B9EFCC58FCA512982A207631F6"/>
-    <TestMouse time="4920" type="2" button="1" buttons="1" globalPos="614,528" pos="175,131"/>
-    <TestMouse time="5010" type="3" button="1" buttons="0" globalPos="614,528" pos="175,131"/>
-    <TestFrame time="5010" hash="383BA6B9EFCC58FCA512982A207631F6"/>
-    <TestFrame time="5070" hash="ADC501A3A2B8AAF72F58BA985B57424E"/>
-    <TestFrame time="5100" hash="BFA51B7C19753EF7B16D78AFFFC7B9DD"/>
-    <TestFrame time="5130" hash="A93F930EC8528F954CD4A770C9A8171B"/>
-    <TestFrame time="5160" hash="0B0C6419E1E5B016D9C22BD98FD452B1"/>
-    <TestFrame time="5190" hash="1D5CD86AB732DA3705A7BB1DEAB77923"/>
-    <TestFrame time="5220" hash="69058485CED6BC992A1A7C5EE34ADD4C"/>
-    <TestFrame time="5250" hash="72731478D80F024076EA639B55152360"/>
-    <TestFrame time="5280" hash="37739777A5979F3EBF85E47E63341660"/>
-    <TestFrame time="5310" hash="FCAE0317F81A3DDD713F4DB1349A9DA0"/>
-    <TestFrame time="5340" hash="82363265ED2B611A54F8D48B2AF22F11"/>
-    <TestFrame time="5370" hash="5FAE0BDC65C609CB766CE585B8C649DB"/>
-    <TestFrame time="5400" hash="2D21B4AF3780EF2BBCCFCEC957CE49C8"/>
-    <TestFrame time="5430" hash="4AB21E266919FB8D340F87091D8E1F62"/>
-    <TestFrame time="5460" hash="5F5DA43901938FA244F536336FFD2DFC"/>
-    <TestFrame time="5490" hash="9B7685F5933C5E06883EE4D1BB2BD2C6"/>
-    <TestFrame time="5520" hash="96C077E3A572EDFF04FA9B2F7020FFD0"/>
-    <TestFrame time="5550" hash="7CB5FC371040E587DE9F06CE14A4B29A"/>
-    <TestMouse time="5910" type="2" button="1" buttons="1" globalPos="614,528" pos="175,131"/>
-    <TestMouse time="6030" type="3" button="1" buttons="0" globalPos="614,528" pos="175,131"/>
-    <TestFrame time="6030" hash="7CB5FC371040E587DE9F06CE14A4B29A"/>
-    <TestFrame time="6090" hash="8F88EE8780C32F038C9ACDC7172DE04E"/>
-    <TestFrame time="6120" hash="BE859D598C5DB953A8FC506DED4940EB"/>
-    <TestFrame time="6150" hash="16FE17B15900FF0464AB20EA921E5B1F"/>
-    <TestFrame time="6180" hash="FCB17070EF24575C61046928A8BBE440"/>
-    <TestFrame time="6210" hash="4F58226BDBDA7339D972ECA065F75766"/>
-    <TestFrame time="6240" hash="D9AF30557F99B086BB1A185A946B580D"/>
-    <TestFrame time="6270" hash="082E0E7650D187A54EF0948CCCA98E5A"/>
-    <TestFrame time="6300" hash="4F41101378A104E72228EEB4BA395CA8"/>
-    <TestFrame time="6330" hash="3223ED179C828FADB3ECA9C6373176C1"/>
-    <TestFrame time="6360" hash="DAFCCE427161A70C3513841AC22AEA00"/>
-    <TestFrame time="6390" hash="7F465A99FCA50503736E470A0B4E1C7A"/>
-    <TestFrame time="6420" hash="97542160B249135B1F3957DBBB329C2E"/>
-    <TestFrame time="6450" hash="F9F74A2E38B52C9266F33E428B6ACD9D"/>
-    <TestFrame time="6480" hash="65AD7E0189C096792331BD1BB0DAF0DB"/>
-    <TestFrame time="6510" hash="BA403842BA3128B1CDF6A9CB28C90751"/>
-    <TestFrame time="6540" hash="1BCDCD0E8166D69F4349E05D5E92FD9D"/>
-    <TestFrame time="6570" hash="383BA6B9EFCC58FCA512982A207631F6"/>
-</TestLog>
diff --git a/tests/auto/declarative/visual/bindinganimation/data/opengl/manifest.xml b/tests/auto/declarative/visual/bindinganimation/data/opengl/manifest.xml
deleted file mode 100644
index 6c5856f..0000000
--- a/tests/auto/declarative/visual/bindinganimation/data/opengl/manifest.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestLog>
-    <TestFullFrame time="30" frameId="0"/>
-    <TestMouse time="1770" type="2" button="1" buttons="1" globalPos="614,528" pos="175,131"/>
-    <TestMouse time="1860" type="3" button="1" buttons="0" globalPos="614,528" pos="175,131"/>
-    <TestFrame time="1860" hash="7CB5FC371040E587DE9F06CE14A4B29A"/>
-    <TestFrame time="1920" hash="8F88EE8780C32F038C9ACDC7172DE04E"/>
-    <TestFrame time="1950" hash="BE859D598C5DB953A8FC506DED4940EB"/>
-    <TestFrame time="1980" hash="16FE17B15900FF0464AB20EA921E5B1F"/>
-    <TestFrame time="2010" hash="FCB17070EF24575C61046928A8BBE440"/>
-    <TestFrame time="2040" hash="4F58226BDBDA7339D972ECA065F75766"/>
-    <TestFrame time="2070" hash="D9AF30557F99B086BB1A185A946B580D"/>
-    <TestFrame time="2100" hash="082E0E7650D187A54EF0948CCCA98E5A"/>
-    <TestFrame time="2130" hash="4F41101378A104E72228EEB4BA395CA8"/>
-    <TestFrame time="2160" hash="3223ED179C828FADB3ECA9C6373176C1"/>
-    <TestFrame time="2190" hash="DAFCCE427161A70C3513841AC22AEA00"/>
-    <TestFrame time="2220" hash="7F465A99FCA50503736E470A0B4E1C7A"/>
-    <TestFrame time="2250" hash="97542160B249135B1F3957DBBB329C2E"/>
-    <TestFrame time="2280" hash="F9F74A2E38B52C9266F33E428B6ACD9D"/>
-    <TestFrame time="2310" hash="65AD7E0189C096792331BD1BB0DAF0DB"/>
-    <TestFrame time="2340" hash="BA403842BA3128B1CDF6A9CB28C90751"/>
-    <TestFrame time="2370" hash="1BCDCD0E8166D69F4349E05D5E92FD9D"/>
-    <TestFrame time="2400" hash="383BA6B9EFCC58FCA512982A207631F6"/>
-    <TestMouse time="2820" type="2" button="1" buttons="1" globalPos="614,528" pos="175,131"/>
-    <TestMouse time="2910" type="3" button="1" buttons="0" globalPos="614,528" pos="175,131"/>
-    <TestFrame time="2910" hash="383BA6B9EFCC58FCA512982A207631F6"/>
-    <TestFrame time="2970" hash="ADC501A3A2B8AAF72F58BA985B57424E"/>
-    <TestFrame time="3000" hash="BFA51B7C19753EF7B16D78AFFFC7B9DD"/>
-    <TestFrame time="3030" hash="A93F930EC8528F954CD4A770C9A8171B"/>
-    <TestFrame time="3060" hash="0B0C6419E1E5B016D9C22BD98FD452B1"/>
-    <TestFrame time="3090" hash="1D5CD86AB732DA3705A7BB1DEAB77923"/>
-    <TestFrame time="3120" hash="69058485CED6BC992A1A7C5EE34ADD4C"/>
-    <TestFrame time="3150" hash="72731478D80F024076EA639B55152360"/>
-    <TestFrame time="3180" hash="37739777A5979F3EBF85E47E63341660"/>
-    <TestFrame time="3210" hash="FCAE0317F81A3DDD713F4DB1349A9DA0"/>
-    <TestFrame time="3240" hash="82363265ED2B611A54F8D48B2AF22F11"/>
-    <TestFrame time="3270" hash="5FAE0BDC65C609CB766CE585B8C649DB"/>
-    <TestFrame time="3300" hash="2D21B4AF3780EF2BBCCFCEC957CE49C8"/>
-    <TestFrame time="3330" hash="4AB21E266919FB8D340F87091D8E1F62"/>
-    <TestFrame time="3360" hash="5F5DA43901938FA244F536336FFD2DFC"/>
-    <TestFrame time="3390" hash="9B7685F5933C5E06883EE4D1BB2BD2C6"/>
-    <TestFrame time="3420" hash="96C077E3A572EDFF04FA9B2F7020FFD0"/>
-    <TestFrame time="3450" hash="7CB5FC371040E587DE9F06CE14A4B29A"/>
-    <TestMouse time="3840" type="2" button="1" buttons="1" globalPos="614,528" pos="175,131"/>
-    <TestMouse time="3930" type="3" button="1" buttons="0" globalPos="614,528" pos="175,131"/>
-    <TestFrame time="3930" hash="7CB5FC371040E587DE9F06CE14A4B29A"/>
-    <TestFrame time="3990" hash="8F88EE8780C32F038C9ACDC7172DE04E"/>
-    <TestFrame time="4020" hash="BE859D598C5DB953A8FC506DED4940EB"/>
-    <TestFrame time="4050" hash="16FE17B15900FF0464AB20EA921E5B1F"/>
-    <TestFrame time="4080" hash="FCB17070EF24575C61046928A8BBE440"/>
-    <TestFrame time="4110" hash="4F58226BDBDA7339D972ECA065F75766"/>
-    <TestFrame time="4140" hash="D9AF30557F99B086BB1A185A946B580D"/>
-    <TestFrame time="4170" hash="082E0E7650D187A54EF0948CCCA98E5A"/>
-    <TestFrame time="4200" hash="4F41101378A104E72228EEB4BA395CA8"/>
-    <TestFrame time="4230" hash="3223ED179C828FADB3ECA9C6373176C1"/>
-    <TestFrame time="4260" hash="DAFCCE427161A70C3513841AC22AEA00"/>
-    <TestFrame time="4290" hash="7F465A99FCA50503736E470A0B4E1C7A"/>
-    <TestFrame time="4320" hash="97542160B249135B1F3957DBBB329C2E"/>
-    <TestFrame time="4350" hash="F9F74A2E38B52C9266F33E428B6ACD9D"/>
-    <TestFrame time="4380" hash="65AD7E0189C096792331BD1BB0DAF0DB"/>
-    <TestFrame time="4410" hash="BA403842BA3128B1CDF6A9CB28C90751"/>
-    <TestFrame time="4440" hash="1BCDCD0E8166D69F4349E05D5E92FD9D"/>
-    <TestFrame time="4470" hash="383BA6B9EFCC58FCA512982A207631F6"/>
-    <TestMouse time="4920" type="2" button="1" buttons="1" globalPos="614,528" pos="175,131"/>
-    <TestMouse time="5010" type="3" button="1" buttons="0" globalPos="614,528" pos="175,131"/>
-    <TestFrame time="5010" hash="383BA6B9EFCC58FCA512982A207631F6"/>
-    <TestFrame time="5070" hash="ADC501A3A2B8AAF72F58BA985B57424E"/>
-    <TestFrame time="5100" hash="BFA51B7C19753EF7B16D78AFFFC7B9DD"/>
-    <TestFrame time="5130" hash="A93F930EC8528F954CD4A770C9A8171B"/>
-    <TestFrame time="5160" hash="0B0C6419E1E5B016D9C22BD98FD452B1"/>
-    <TestFrame time="5190" hash="1D5CD86AB732DA3705A7BB1DEAB77923"/>
-    <TestFrame time="5220" hash="69058485CED6BC992A1A7C5EE34ADD4C"/>
-    <TestFrame time="5250" hash="72731478D80F024076EA639B55152360"/>
-    <TestFrame time="5280" hash="37739777A5979F3EBF85E47E63341660"/>
-    <TestFrame time="5310" hash="FCAE0317F81A3DDD713F4DB1349A9DA0"/>
-    <TestFrame time="5340" hash="82363265ED2B611A54F8D48B2AF22F11"/>
-    <TestFrame time="5370" hash="5FAE0BDC65C609CB766CE585B8C649DB"/>
-    <TestFrame time="5400" hash="2D21B4AF3780EF2BBCCFCEC957CE49C8"/>
-    <TestFrame time="5430" hash="4AB21E266919FB8D340F87091D8E1F62"/>
-    <TestFrame time="5460" hash="5F5DA43901938FA244F536336FFD2DFC"/>
-    <TestFrame time="5490" hash="9B7685F5933C5E06883EE4D1BB2BD2C6"/>
-    <TestFrame time="5520" hash="96C077E3A572EDFF04FA9B2F7020FFD0"/>
-    <TestFrame time="5550" hash="7CB5FC371040E587DE9F06CE14A4B29A"/>
-    <TestMouse time="5910" type="2" button="1" buttons="1" globalPos="614,528" pos="175,131"/>
-    <TestMouse time="6030" type="3" button="1" buttons="0" globalPos="614,528" pos="175,131"/>
-    <TestFrame time="6030" hash="7CB5FC371040E587DE9F06CE14A4B29A"/>
-    <TestFrame time="6090" hash="8F88EE8780C32F038C9ACDC7172DE04E"/>
-    <TestFrame time="6120" hash="BE859D598C5DB953A8FC506DED4940EB"/>
-    <TestFrame time="6150" hash="16FE17B15900FF0464AB20EA921E5B1F"/>
-    <TestFrame time="6180" hash="FCB17070EF24575C61046928A8BBE440"/>
-    <TestFrame time="6210" hash="4F58226BDBDA7339D972ECA065F75766"/>
-    <TestFrame time="6240" hash="D9AF30557F99B086BB1A185A946B580D"/>
-    <TestFrame time="6270" hash="082E0E7650D187A54EF0948CCCA98E5A"/>
-    <TestFrame time="6300" hash="4F41101378A104E72228EEB4BA395CA8"/>
-    <TestFrame time="6330" hash="3223ED179C828FADB3ECA9C6373176C1"/>
-    <TestFrame time="6360" hash="DAFCCE427161A70C3513841AC22AEA00"/>
-    <TestFrame time="6390" hash="7F465A99FCA50503736E470A0B4E1C7A"/>
-    <TestFrame time="6420" hash="97542160B249135B1F3957DBBB329C2E"/>
-    <TestFrame time="6450" hash="F9F74A2E38B52C9266F33E428B6ACD9D"/>
-    <TestFrame time="6480" hash="65AD7E0189C096792331BD1BB0DAF0DB"/>
-    <TestFrame time="6510" hash="BA403842BA3128B1CDF6A9CB28C90751"/>
-    <TestFrame time="6540" hash="1BCDCD0E8166D69F4349E05D5E92FD9D"/>
-    <TestFrame time="6570" hash="383BA6B9EFCC58FCA512982A207631F6"/>
-</TestLog>
diff --git a/tests/auto/declarative/visual/bindinganimation/data/opengl/image0.png b/tests/auto/declarative/visual/bindinganimation/data/raster/image0.png
index 2cda3fa..92f8cdd 100644
--- a/tests/auto/declarative/visual/bindinganimation/data/opengl/image0.png
+++ b/tests/auto/declarative/visual/bindinganimation/data/raster/image0.png
diff --git a/tests/auto/declarative/visual/bindinganimation/data/raster/manifest.qml b/tests/auto/declarative/visual/bindinganimation/data/raster/manifest.qml
new file mode 100644
index 0000000..1454949
--- /dev/null
+++ b/tests/auto/declarative/visual/bindinganimation/data/raster/manifest.qml
@@ -0,0 +1,86 @@
+TestLog {
+    TestFullFrame {
+        time: 0
+        frameId: 0
+        }
+    TestMouse {
+        time: 1296
+        type: 2
+        button: 1
+        buttons: 1
+        globalPos: '87,985'
+        pos: '83,29'
+    }
+    TestMouse {
+        time: 1360
+        type: 3
+        button: 1
+        buttons: 0
+        globalPos: '87,985'
+        pos: '83,29'
+    }
+    TestFrame {
+        time: 1376
+        hash: '7CB5FC371040E587DE9F06CE14A4B29A'
+    }
+    TestFrame {
+        time: 1392
+        hash: 'A5E5DBD179C7E48D34B8107F8CC6B5BE'
+    }
+    TestFrame {
+        time: 1408
+        hash: 'A5E5DBD179C7E48D34B8107F8CC6B5BE'
+    }
+    TestFrame {
+        time: 1424
+        hash: '69FB651AA84E07E4A6DEAA31CB10641B'
+    }
+    TestFrame {
+        time: 1440
+        hash: '3FFC4C4BD282010A359DCEAF2D8496AC'
+    }
+    TestFrame {
+        time: 1456
+        hash: '3FFC4C4BD282010A359DCEAF2D8496AC'
+    }
+    TestFrame {
+        time: 1472
+        hash: 'ADA58B13247A654BBCECF3F254AB797F'
+    }
+    TestFrame {
+        time: 1488
+        hash: 'B314799BC732B6BD8C42A622B720E3D5'
+    }
+    TestFrame {
+        time: 1504
+        hash: 'B314799BC732B6BD8C42A622B720E3D5'
+    }
+    TestFrame {
+        time: 1520
+        hash: '7377569C13CF5DE368B22209AB8AE395'
+    }
+    TestFrame {
+        time: 1536
+        hash: '7C1E4A1F80C68EE57D052A9D7851F937'
+    }
+    TestFrame {
+        time: 1552
+        hash: '7C1E4A1F80C68EE57D052A9D7851F937'
+    }
+    TestFrame {
+        time: 1568
+        hash: '24D6DB9544205075836A86A54B55A820'
+    }
+    TestFrame {
+        time: 1584
+        hash: '24D6DB9544205075836A86A54B55A820'
+    }
+    TestFrame {
+        time: 1600
+        hash: '8A84E4C3E8AD4C6A9A7BD3E1620718C1'
+    }
+    TestFrame {
+        time: 1616
+        hash: 'B8EA544A4EF3B7E0A9E0A7777B55EDC7'
+    }
+}
diff --git a/tests/auto/declarative/visual/bindinganimation/test b/tests/auto/declarative/visual/bindinganimation/test
index 964c489..bb59333 100644
--- a/tests/auto/declarative/visual/bindinganimation/test
+++ b/tests/auto/declarative/visual/bindinganimation/test
@@ -1 +1 @@
-bindinganimation.xml
+bindinganimation.qml
diff --git a/tests/auto/declarative/visual/colorAnimation/colorAnimation.qml b/tests/auto/declarative/visual/colorAnimation/colorAnimation.qml
new file mode 100644
index 0000000..d351b8c
--- /dev/null
+++ b/tests/auto/declarative/visual/colorAnimation/colorAnimation.qml
@@ -0,0 +1,41 @@
+Rect {
+    id: mainrect
+    width: 200; height: 200
+    state: "first"
+    states: [
+        State {
+            name: "first"
+            SetProperty {
+                target: mainrect
+                property: "color"
+                value: "red"
+            }
+        },
+        State {
+            name: "second"
+            SetProperty {
+                target: mainrect
+                property: "color"
+                value: "blue"
+            }
+        }
+    ]
+    transitions: [
+        Transition {
+            fromState: "first"
+            toState: "second"
+            reversible: true
+            SequentialAnimation {
+                ColorAnimation {
+                    duration: 2000
+                    target: mainrect
+                    property: "color"
+                }
+            }
+        }
+    ]
+    MouseRegion {
+        anchors.fill: parent
+        onClicked: { mainrect.state = 'second' }
+    }
+}
diff --git a/tests/auto/declarative/visual/colorAnimation/colorAnimation.xml b/tests/auto/declarative/visual/colorAnimation/colorAnimation.xml
deleted file mode 100644
index 39d08be..0000000
--- a/tests/auto/declarative/visual/colorAnimation/colorAnimation.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Rect id="mainrect" currentState="first">
-<states>
-    <State name="first">
-        <SetProperty target="{mainrect}" property="color" value="red"/>
-    </State>
-    <State name="second" >
-        <SetProperty target="{mainrect}" property="color" value="blue"/>
-    </State>
-</states>
-<transitions>
-    <Transition fromState="first" toState="second" reversible="true" >
-        <SerialAnimation>
-            <ColorAnimation duration="2000" target="{mainrect}" property="color" />
-        </SerialAnimation>
-    </Transition>
-</transitions>
-<MouseRegion anchors.fill="{parent}" onClick="mainrect.currentState = 'second'" />
-</Rect>
diff --git a/tests/auto/declarative/visual/colorAnimation/data/raster/image0.png b/tests/auto/declarative/visual/colorAnimation/data/raster/image0.png
new file mode 100644
index 0000000..f00a2e2
--- /dev/null
+++ b/tests/auto/declarative/visual/colorAnimation/data/raster/image0.png
diff --git a/tests/auto/declarative/visual/colorAnimation/data/raster/manifest.qml b/tests/auto/declarative/visual/colorAnimation/data/raster/manifest.qml
new file mode 100644
index 0000000..0eb8b12
--- /dev/null
+++ b/tests/auto/declarative/visual/colorAnimation/data/raster/manifest.qml
@@ -0,0 +1,522 @@
+TestLog {
+    TestFullFrame {
+        time: 0
+        frameId: 0
+        }
+    TestMouse {
+        time: 944
+        type: 2
+        button: 1
+        buttons: 1
+        globalPos: '1789,188'
+        pos: '73,76'
+    }
+    TestMouse {
+        time: 992
+        type: 3
+        button: 1
+        buttons: 0
+        globalPos: '1789,188'
+        pos: '73,76'
+    }
+    TestFrame {
+        time: 1008
+        hash: 'E5BDA0DAF98288CE18DB6CE06EDA3BA0'
+    }
+    TestFrame {
+        time: 1024
+        hash: 'D35008F75B8C992F80FB16BA7203649D'
+    }
+    TestFrame {
+        time: 1040
+        hash: '14F43E0784DDF42EA8550DB88C501BF1'
+    }
+    TestFrame {
+        time: 1056
+        hash: '02276E158B5391480B1BDEAADF1FB903'
+    }
+    TestFrame {
+        time: 1072
+        hash: '35D9513EB97A2C482B7CD197DE910934'
+    }
+    TestFrame {
+        time: 1088
+        hash: 'FAF0FD681E60BB2489099F5DF772B6CD'
+    }
+    TestFrame {
+        time: 1104
+        hash: 'A863D3E346F94785A3A392FDC91526EB'
+    }
+    TestFrame {
+        time: 1120
+        hash: 'FDF328D3F6EB8410DA59A91345E41A44'
+    }
+    TestFrame {
+        time: 1136
+        hash: '83514A3B10D5BE8F6C3B128D0F3E0B1C'
+    }
+    TestFrame {
+        time: 1152
+        hash: 'EAD0EAE76CD00189075964671EFFBAEA'
+    }
+    TestFrame {
+        time: 1168
+        hash: '24D2457FCD51490FDA23071BF9929D12'
+    }
+    TestFrame {
+        time: 1184
+        hash: '1478683446CF543DACBE31D0B76A98A6'
+    }
+    TestFrame {
+        time: 1200
+        hash: '99F7DA1F31FE920F6C02ADD4042AE925'
+    }
+    TestFrame {
+        time: 1216
+        hash: '22DEF892006CF66667770B0F17BAF6C0'
+    }
+    TestFrame {
+        time: 1232
+        hash: '6A36D5A77099BFD58BAF285478FF04E4'
+    }
+    TestFrame {
+        time: 1248
+        hash: '6258150666B59B20AB476724C07FC20C'
+    }
+    TestFrame {
+        time: 1264
+        hash: 'F1636315BC950A6DD400D9C7ED263B88'
+    }
+    TestFrame {
+        time: 1280
+        hash: '18447EA8DC2E8DA956788E5B3CF3790A'
+    }
+    TestFrame {
+        time: 1296
+        hash: '1D2A6E65997A73E9E670356C8E8B63B2'
+    }
+    TestFrame {
+        time: 1312
+        hash: 'BED0242C0F9EF229D1392835286D5782'
+    }
+    TestFrame {
+        time: 1328
+        hash: '88923C190E9E5BEADEF8A409C06DF9D6'
+    }
+    TestFrame {
+        time: 1344
+        hash: '2D133E7EE60C97386F57838B3F0976C7'
+    }
+    TestFrame {
+        time: 1360
+        hash: '85B1821CC50F2A9F3ED6944F792B7A2F'
+    }
+    TestFrame {
+        time: 1376
+        hash: '395195716D76BC0BE7B2033ED37A7A1C'
+    }
+    TestFrame {
+        time: 1392
+        hash: '243DBFFCF416926242BBCB7348974C4C'
+    }
+    TestFrame {
+        time: 1408
+        hash: 'A755068679616D8AC65C2AA7431F2A19'
+    }
+    TestFrame {
+        time: 1424
+        hash: 'E8249B35A47EB492CBDF2D91CC8426F0'
+    }
+    TestFrame {
+        time: 1440
+        hash: '15F3DA1C0E6F0779B96859D51171DD27'
+    }
+    TestFrame {
+        time: 1456
+        hash: '258C0C756AAC3DE743B43051F2AACE6B'
+    }
+    TestFrame {
+        time: 1472
+        hash: 'A58B9FDF301D72B2CC5C93934CC8927B'
+    }
+    TestFrame {
+        time: 1488
+        hash: 'A9181D30870D472521F8904818CE520F'
+    }
+    TestFrame {
+        time: 1504
+        hash: '7F9E94069CCF3897C26A71BD7BECD903'
+    }
+    TestFrame {
+        time: 1520
+        hash: 'BDF305C2F46CDB86DBF57B1E0CC5A65B'
+    }
+    TestFrame {
+        time: 1536
+        hash: 'FE5B6865D7E4FC7D1D42C1E74F8666F7'
+    }
+    TestFrame {
+        time: 1552
+        hash: '734F0DE45A6E34C9EAB7EF606196F96A'
+    }
+    TestFrame {
+        time: 1568
+        hash: '02A361C4534FDF7F286DC3E6DC23275C'
+    }
+    TestFrame {
+        time: 1584
+        hash: 'E649155AD69999C14B92F6561E4D1185'
+    }
+    TestFrame {
+        time: 1600
+        hash: '01AF177084FAB755D622973F64B92018'
+    }
+    TestFrame {
+        time: 1616
+        hash: '097CC4A082DFAB995D213A3A73883C97'
+    }
+    TestFrame {
+        time: 1632
+        hash: 'D7B4239A3280B1EB8E885E3F422DF8E9'
+    }
+    TestFrame {
+        time: 1648
+        hash: '59893977994E34E83F91E7CE3AD65D6D'
+    }
+    TestFrame {
+        time: 1664
+        hash: 'B68E3FBB5CDCD6BD96DF7DEC558DB42B'
+    }
+    TestFrame {
+        time: 1680
+        hash: '94AD0580648F36A1E18A9EA7E249B04D'
+    }
+    TestFrame {
+        time: 1696
+        hash: '750A4C01D2F5806A89A1C6CC6A9B9A68'
+    }
+    TestFrame {
+        time: 1712
+        hash: '4F109F50F388F1BFA4BC6B03B3E6E514'
+    }
+    TestFrame {
+        time: 1728
+        hash: 'C6168D5CF27A533E8EE636637667BE47'
+    }
+    TestFrame {
+        time: 1744
+        hash: 'F8120547BED987AA34C00DA5A01A4D1E'
+    }
+    TestFrame {
+        time: 1760
+        hash: 'CBFF526136FA2C128C8B898FBBEF9E5C'
+    }
+    TestFrame {
+        time: 1776
+        hash: 'F29E52398FAB1A239A63DF4C32F2FC69'
+    }
+    TestFrame {
+        time: 1792
+        hash: '7178BFE86FD2FD513218B33760460F8D'
+    }
+    TestFrame {
+        time: 1808
+        hash: 'CA83285BC8AC633403896FE976896EB0'
+    }
+    TestFrame {
+        time: 1824
+        hash: '96BA486C09CC69D5AA38C46C00DF1181'
+    }
+    TestFrame {
+        time: 1840
+        hash: 'B88EAB335842787869F4A14824C19DD8'
+    }
+    TestFrame {
+        time: 1856
+        hash: '065AA59012729E1E1A246A2083142690'
+    }
+    TestFrame {
+        time: 1872
+        hash: 'DD0E98C8398861002C5F178C5F9F612D'
+    }
+    TestFrame {
+        time: 1888
+        hash: '04192C2B545948048ECCF4D81BBDE198'
+    }
+    TestFrame {
+        time: 1904
+        hash: 'BB7502C7208281EF9FD41714AB88A1A8'
+    }
+    TestFrame {
+        time: 1920
+        hash: '5397195471890D08B703DCA101E5BC7C'
+    }
+    TestFrame {
+        time: 1936
+        hash: '4C678CDBEBB2FFD2CBF012CA77800CDE'
+    }
+    TestFrame {
+        time: 1952
+        hash: '0D7A34ECD0C7F52B2C015037BF1902C6'
+    }
+    TestFrame {
+        time: 1968
+        hash: 'FD9D5048BE749AC4369FDA2D018B43AE'
+    }
+    TestFrame {
+        time: 1984
+        hash: '93EE03795CD57AE6F7FE3A020B039AD4'
+    }
+    TestFrame {
+        time: 2000
+        hash: '5E1118963F219C39761CA7FBF564A9CA'
+    }
+    TestFrame {
+        time: 2016
+        hash: '8F40038741903150136170503649D941'
+    }
+    TestFrame {
+        time: 2032
+        hash: 'B087B7D0AA6224821F8E18718FF5E77D'
+    }
+    TestFrame {
+        time: 2048
+        hash: 'AA46B04A3C67DC772265ED2901955565'
+    }
+    TestFrame {
+        time: 2064
+        hash: 'AC024BF2AEB4BECDF31A09FE0A6DB8F3'
+    }
+    TestFrame {
+        time: 2080
+        hash: '13745A174E4D06E2108A5BF125BA50CC'
+    }
+    TestFrame {
+        time: 2096
+        hash: 'BD972F0D8E230ECA0B3FEA1B8C960C08'
+    }
+    TestFrame {
+        time: 2112
+        hash: 'CBDBEC802A58E7CED0CF45B3AB0BC0BA'
+    }
+    TestFrame {
+        time: 2128
+        hash: '5128584C50305C7D218B81B8367FA3D5'
+    }
+    TestFrame {
+        time: 2144
+        hash: 'A71461D3593F3685620668916DE870BD'
+    }
+    TestFrame {
+        time: 2160
+        hash: '74EBAC8F32CF044B58D9883DBCD9A722'
+    }
+    TestFrame {
+        time: 2176
+        hash: 'FEDC5B638F339B90FE59B478721E65B7'
+    }
+    TestFrame {
+        time: 2192
+        hash: 'BCB8C7159F54C353551DD3BFF3203966'
+    }
+    TestFrame {
+        time: 2208
+        hash: '4E9B083075BC5E9287A8ABC982778B56'
+    }
+    TestFrame {
+        time: 2224
+        hash: '1D6F02AA99AFA47D77FC49AB894B365A'
+    }
+    TestFrame {
+        time: 2240
+        hash: 'A204FEEC783B3B05DE4C209C21745826'
+    }
+    TestFrame {
+        time: 2256
+        hash: '665A2A8FF00B9663157802767F504754'
+    }
+    TestFrame {
+        time: 2272
+        hash: '624FB09EBE60CB87D767FAF8D2420B1E'
+    }
+    TestFrame {
+        time: 2288
+        hash: 'E5AF0CDC33F3275A25ABB09E9165F310'
+    }
+    TestFrame {
+        time: 2304
+        hash: '02BAFB5A81CA66F7670AC93DE5123860'
+    }
+    TestFrame {
+        time: 2320
+        hash: 'E7AA6374C73832E57CEB2427A1E258AA'
+    }
+    TestFrame {
+        time: 2336
+        hash: 'B5ABD0DFF1AB076FAAC7CC226E83F5D0'
+    }
+    TestFrame {
+        time: 2352
+        hash: 'B759ACC35BCCFF8EFC2E6FE276DDC0F7'
+    }
+    TestFrame {
+        time: 2368
+        hash: 'CE52E18C1F7732768779863B45314FF5'
+    }
+    TestFrame {
+        time: 2384
+        hash: '99D30652559DD6931E0C95543EEAA149'
+    }
+    TestFrame {
+        time: 2400
+        hash: 'FFBD9A00E05E085B89296D19D5CAEC57'
+    }
+    TestFrame {
+        time: 2416
+        hash: '9C9D658B9C25602816B8066BF19105DB'
+    }
+    TestFrame {
+        time: 2432
+        hash: '2B7FD058E6601E22A30BB7106B1C683B'
+    }
+    TestFrame {
+        time: 2448
+        hash: 'F4C7E26B19EE0A3E7C9688685EB7BD05'
+    }
+    TestFrame {
+        time: 2464
+        hash: '0DC6D593BCEFF56B7F81F2A49D37FEFB'
+    }
+    TestFrame {
+        time: 2480
+        hash: '9BFD7AD5091CCBDDE43C593E133A7B10'
+    }
+    TestFrame {
+        time: 2496
+        hash: '2703B617937914A90EA42EBF249D79EE'
+    }
+    TestFrame {
+        time: 2512
+        hash: 'B77E2983138254016C4CCA53100F46FA'
+    }
+    TestFrame {
+        time: 2528
+        hash: '60C4DD24187D1281081479E586F02B37'
+    }
+    TestFrame {
+        time: 2544
+        hash: '62F2511ABD99EF1231C9FA4B91D4ABFE'
+    }
+    TestFrame {
+        time: 2560
+        hash: 'E309B3353FD174E883D309571CADDC98'
+    }
+    TestFrame {
+        time: 2576
+        hash: '1E2D6A134C7B12DDE551B148EF4F088C'
+    }
+    TestFrame {
+        time: 2592
+        hash: 'E5DC5450604A491CC24A0DCF5C278B58'
+    }
+    TestFrame {
+        time: 2608
+        hash: 'C8DAE97C10E1962C1E6A51AB3AB8579E'
+    }
+    TestFrame {
+        time: 2624
+        hash: '4E1B7E06F55FB084080689B474F1FE1D'
+    }
+    TestFrame {
+        time: 2640
+        hash: 'B4639C907FA937BF15FAC62421170CD8'
+    }
+    TestFrame {
+        time: 2656
+        hash: 'C250208A0CAEB5F6CB4D3AAC3D7D350B'
+    }
+    TestFrame {
+        time: 2672
+        hash: 'A73351EABECF0D71149EFE31F197413E'
+    }
+    TestFrame {
+        time: 2688
+        hash: '479425F1B7AFF79E4DFB7FCA534AF018'
+    }
+    TestFrame {
+        time: 2704
+        hash: '046D0F0040A52D1F26BA9F7C5DE06EF4'
+    }
+    TestFrame {
+        time: 2720
+        hash: '655778BF13C6080903150B0EB43A7EDC'
+    }
+    TestFrame {
+        time: 2736
+        hash: '72DA0BBE81514870655FDD3354ADAC60'
+    }
+    TestFrame {
+        time: 2752
+        hash: 'DEFE0BDF675C65FFF55AAACED1E4DAE7'
+    }
+    TestFrame {
+        time: 2768
+        hash: 'C988628B6C3D3780E9A865C7694926CD'
+    }
+    TestFrame {
+        time: 2784
+        hash: '5AB17563655231089EDD986FF13D6012'
+    }
+    TestFrame {
+        time: 2800
+        hash: 'C1ADFF1D2E5800ED466D1691D3B17382'
+    }
+    TestFrame {
+        time: 2816
+        hash: '70129BA01FBB19592B9DC0D0A3B3E7DF'
+    }
+    TestFrame {
+        time: 2832
+        hash: '0000829EF7ED908BF430D42904D59CC2'
+    }
+    TestFrame {
+        time: 2848
+        hash: '843D2927F50AB87B4A86B7A6AAEED91F'
+    }
+    TestFrame {
+        time: 2864
+        hash: 'DA86D21756025E7DE8050586D5E2A1F8'
+    }
+    TestFrame {
+        time: 2880
+        hash: '48DD1BD6580133B0793FEE327EA4F1E6'
+    }
+    TestFrame {
+        time: 2896
+        hash: 'F0618193DCD0BA2837249515A1898B1C'
+    }
+    TestFrame {
+        time: 2912
+        hash: 'A530184E57251065286C0CBBA7301E9C'
+    }
+    TestFrame {
+        time: 2928
+        hash: '64A1D7203973D65DD342793007A61C58'
+    }
+    TestFrame {
+        time: 2944
+        hash: '5B830DFC6BA442772DE87D75D5A578DE'
+    }
+    TestFrame {
+        time: 2960
+        hash: '5563B056B0409B65F60DD16DD0DD890E'
+    }
+    TestFrame {
+        time: 2976
+        hash: 'B8BCF9AD2CA8720C11563A23D8280804'
+    }
+    TestFrame {
+        time: 2992
+        hash: '8C0FCDA4F8956394C53FC4BA18CAA850'
+    }
+}
diff --git a/tests/auto/declarative/visual/colorAnimation/data/raster/manifest.xml b/tests/auto/declarative/visual/colorAnimation/data/raster/manifest.xml
new file mode 100644
index 0000000..1fe2f15
--- /dev/null
+++ b/tests/auto/declarative/visual/colorAnimation/data/raster/manifest.xml
@@ -0,0 +1,522 @@
+TestLog {
+    TestFullFrame {
+        time: 0
+        frameId: 0
+        }
+    TestFrame {
+        time: 16
+        hash: 'E5BDA0DAF98288CE18DB6CE06EDA3BA0'
+    }
+    TestFrame {
+        time: 32
+        hash: 'D35008F75B8C992F80FB16BA7203649D'
+    }
+    TestFrame {
+        time: 48
+        hash: '14F43E0784DDF42EA8550DB88C501BF1'
+    }
+    TestFrame {
+        time: 64
+        hash: '02276E158B5391480B1BDEAADF1FB903'
+    }
+    TestFrame {
+        time: 80
+        hash: '35D9513EB97A2C482B7CD197DE910934'
+    }
+    TestFrame {
+        time: 96
+        hash: 'FAF0FD681E60BB2489099F5DF772B6CD'
+    }
+    TestFrame {
+        time: 112
+        hash: 'A863D3E346F94785A3A392FDC91526EB'
+    }
+    TestFrame {
+        time: 128
+        hash: 'FDF328D3F6EB8410DA59A91345E41A44'
+    }
+    TestFrame {
+        time: 144
+        hash: '83514A3B10D5BE8F6C3B128D0F3E0B1C'
+    }
+    TestFrame {
+        time: 160
+        hash: 'EAD0EAE76CD00189075964671EFFBAEA'
+    }
+    TestFrame {
+        time: 176
+        hash: '24D2457FCD51490FDA23071BF9929D12'
+    }
+    TestFrame {
+        time: 192
+        hash: '1478683446CF543DACBE31D0B76A98A6'
+    }
+    TestFrame {
+        time: 208
+        hash: '99F7DA1F31FE920F6C02ADD4042AE925'
+    }
+    TestFrame {
+        time: 224
+        hash: '22DEF892006CF66667770B0F17BAF6C0'
+    }
+    TestFrame {
+        time: 240
+        hash: '6A36D5A77099BFD58BAF285478FF04E4'
+    }
+    TestFrame {
+        time: 256
+        hash: '6258150666B59B20AB476724C07FC20C'
+    }
+    TestFrame {
+        time: 272
+        hash: 'F1636315BC950A6DD400D9C7ED263B88'
+    }
+    TestFrame {
+        time: 288
+        hash: '18447EA8DC2E8DA956788E5B3CF3790A'
+    }
+    TestFrame {
+        time: 304
+        hash: '1D2A6E65997A73E9E670356C8E8B63B2'
+    }
+    TestFrame {
+        time: 320
+        hash: 'BED0242C0F9EF229D1392835286D5782'
+    }
+    TestFrame {
+        time: 336
+        hash: '88923C190E9E5BEADEF8A409C06DF9D6'
+    }
+    TestFrame {
+        time: 352
+        hash: '2D133E7EE60C97386F57838B3F0976C7'
+    }
+    TestFrame {
+        time: 368
+        hash: '85B1821CC50F2A9F3ED6944F792B7A2F'
+    }
+    TestFrame {
+        time: 384
+        hash: '395195716D76BC0BE7B2033ED37A7A1C'
+    }
+    TestFrame {
+        time: 400
+        hash: '243DBFFCF416926242BBCB7348974C4C'
+    }
+    TestFrame {
+        time: 416
+        hash: 'A755068679616D8AC65C2AA7431F2A19'
+    }
+    TestFrame {
+        time: 432
+        hash: 'E8249B35A47EB492CBDF2D91CC8426F0'
+    }
+    TestFrame {
+        time: 448
+        hash: '15F3DA1C0E6F0779B96859D51171DD27'
+    }
+    TestFrame {
+        time: 464
+        hash: '258C0C756AAC3DE743B43051F2AACE6B'
+    }
+    TestFrame {
+        time: 480
+        hash: 'A58B9FDF301D72B2CC5C93934CC8927B'
+    }
+    TestFrame {
+        time: 496
+        hash: 'A9181D30870D472521F8904818CE520F'
+    }
+    TestFrame {
+        time: 512
+        hash: '7F9E94069CCF3897C26A71BD7BECD903'
+    }
+    TestFrame {
+        time: 528
+        hash: 'BDF305C2F46CDB86DBF57B1E0CC5A65B'
+    }
+    TestFrame {
+        time: 544
+        hash: 'FE5B6865D7E4FC7D1D42C1E74F8666F7'
+    }
+    TestFrame {
+        time: 560
+        hash: '734F0DE45A6E34C9EAB7EF606196F96A'
+    }
+    TestFrame {
+        time: 576
+        hash: '02A361C4534FDF7F286DC3E6DC23275C'
+    }
+    TestFrame {
+        time: 592
+        hash: 'E649155AD69999C14B92F6561E4D1185'
+    }
+    TestFrame {
+        time: 608
+        hash: '01AF177084FAB755D622973F64B92018'
+    }
+    TestFrame {
+        time: 624
+        hash: '097CC4A082DFAB995D213A3A73883C97'
+    }
+    TestFrame {
+        time: 640
+        hash: 'D7B4239A3280B1EB8E885E3F422DF8E9'
+    }
+    TestFrame {
+        time: 656
+        hash: '59893977994E34E83F91E7CE3AD65D6D'
+    }
+    TestFrame {
+        time: 672
+        hash: 'B68E3FBB5CDCD6BD96DF7DEC558DB42B'
+    }
+    TestFrame {
+        time: 688
+        hash: '94AD0580648F36A1E18A9EA7E249B04D'
+    }
+    TestFrame {
+        time: 704
+        hash: '750A4C01D2F5806A89A1C6CC6A9B9A68'
+    }
+    TestFrame {
+        time: 720
+        hash: '4F109F50F388F1BFA4BC6B03B3E6E514'
+    }
+    TestFrame {
+        time: 736
+        hash: 'C6168D5CF27A533E8EE636637667BE47'
+    }
+    TestFrame {
+        time: 752
+        hash: 'F8120547BED987AA34C00DA5A01A4D1E'
+    }
+    TestFrame {
+        time: 768
+        hash: 'CBFF526136FA2C128C8B898FBBEF9E5C'
+    }
+    TestFrame {
+        time: 784
+        hash: 'F29E52398FAB1A239A63DF4C32F2FC69'
+    }
+    TestFrame {
+        time: 800
+        hash: '7178BFE86FD2FD513218B33760460F8D'
+    }
+    TestFrame {
+        time: 816
+        hash: 'CA83285BC8AC633403896FE976896EB0'
+    }
+    TestFrame {
+        time: 832
+        hash: '96BA486C09CC69D5AA38C46C00DF1181'
+    }
+    TestFrame {
+        time: 848
+        hash: 'B88EAB335842787869F4A14824C19DD8'
+    }
+    TestFrame {
+        time: 864
+        hash: '065AA59012729E1E1A246A2083142690'
+    }
+    TestFrame {
+        time: 880
+        hash: 'DD0E98C8398861002C5F178C5F9F612D'
+    }
+    TestFrame {
+        time: 896
+        hash: '04192C2B545948048ECCF4D81BBDE198'
+    }
+    TestMouse {
+        time: 912
+        type: 2
+        button: 1
+        buttons: 1
+        globalPos: '1739,207'
+        pos: '75,95'
+    }
+    TestFrame {
+        time: 912
+        hash: 'BB7502C7208281EF9FD41714AB88A1A8'
+    }
+    TestFrame {
+        time: 928
+        hash: '5397195471890D08B703DCA101E5BC7C'
+    }
+    TestFrame {
+        time: 944
+        hash: '4C678CDBEBB2FFD2CBF012CA77800CDE'
+    }
+    TestFrame {
+        time: 960
+        hash: '0D7A34ECD0C7F52B2C015037BF1902C6'
+    }
+    TestMouse {
+        time: 976
+        type: 3
+        button: 1
+        buttons: 0
+        globalPos: '1739,207'
+        pos: '75,95'
+    }
+    TestFrame {
+        time: 976
+        hash: 'FD9D5048BE749AC4369FDA2D018B43AE'
+    }
+    TestFrame {
+        time: 992
+        hash: '93EE03795CD57AE6F7FE3A020B039AD4'
+    }
+    TestFrame {
+        time: 1008
+        hash: '5E1118963F219C39761CA7FBF564A9CA'
+    }
+    TestFrame {
+        time: 1024
+        hash: '8F40038741903150136170503649D941'
+    }
+    TestFrame {
+        time: 1040
+        hash: 'B087B7D0AA6224821F8E18718FF5E77D'
+    }
+    TestFrame {
+        time: 1056
+        hash: 'AA46B04A3C67DC772265ED2901955565'
+    }
+    TestFrame {
+        time: 1072
+        hash: 'AC024BF2AEB4BECDF31A09FE0A6DB8F3'
+    }
+    TestFrame {
+        time: 1088
+        hash: '13745A174E4D06E2108A5BF125BA50CC'
+    }
+    TestFrame {
+        time: 1104
+        hash: 'BD972F0D8E230ECA0B3FEA1B8C960C08'
+    }
+    TestFrame {
+        time: 1120
+        hash: 'CBDBEC802A58E7CED0CF45B3AB0BC0BA'
+    }
+    TestFrame {
+        time: 1136
+        hash: '5128584C50305C7D218B81B8367FA3D5'
+    }
+    TestFrame {
+        time: 1152
+        hash: 'A71461D3593F3685620668916DE870BD'
+    }
+    TestFrame {
+        time: 1168
+        hash: '74EBAC8F32CF044B58D9883DBCD9A722'
+    }
+    TestFrame {
+        time: 1184
+        hash: 'FEDC5B638F339B90FE59B478721E65B7'
+    }
+    TestFrame {
+        time: 1200
+        hash: 'BCB8C7159F54C353551DD3BFF3203966'
+    }
+    TestFrame {
+        time: 1216
+        hash: '4E9B083075BC5E9287A8ABC982778B56'
+    }
+    TestFrame {
+        time: 1232
+        hash: '1D6F02AA99AFA47D77FC49AB894B365A'
+    }
+    TestFrame {
+        time: 1248
+        hash: 'A204FEEC783B3B05DE4C209C21745826'
+    }
+    TestFrame {
+        time: 1264
+        hash: '665A2A8FF00B9663157802767F504754'
+    }
+    TestFrame {
+        time: 1280
+        hash: '624FB09EBE60CB87D767FAF8D2420B1E'
+    }
+    TestFrame {
+        time: 1296
+        hash: 'E5AF0CDC33F3275A25ABB09E9165F310'
+    }
+    TestFrame {
+        time: 1312
+        hash: '02BAFB5A81CA66F7670AC93DE5123860'
+    }
+    TestFrame {
+        time: 1328
+        hash: 'E7AA6374C73832E57CEB2427A1E258AA'
+    }
+    TestFrame {
+        time: 1344
+        hash: 'B5ABD0DFF1AB076FAAC7CC226E83F5D0'
+    }
+    TestFrame {
+        time: 1360
+        hash: 'B759ACC35BCCFF8EFC2E6FE276DDC0F7'
+    }
+    TestFrame {
+        time: 1376
+        hash: 'CE52E18C1F7732768779863B45314FF5'
+    }
+    TestFrame {
+        time: 1392
+        hash: '99D30652559DD6931E0C95543EEAA149'
+    }
+    TestFrame {
+        time: 1408
+        hash: 'FFBD9A00E05E085B89296D19D5CAEC57'
+    }
+    TestFrame {
+        time: 1424
+        hash: '9C9D658B9C25602816B8066BF19105DB'
+    }
+    TestFrame {
+        time: 1440
+        hash: '2B7FD058E6601E22A30BB7106B1C683B'
+    }
+    TestFrame {
+        time: 1456
+        hash: 'F4C7E26B19EE0A3E7C9688685EB7BD05'
+    }
+    TestFrame {
+        time: 1472
+        hash: '0DC6D593BCEFF56B7F81F2A49D37FEFB'
+    }
+    TestFrame {
+        time: 1488
+        hash: '9BFD7AD5091CCBDDE43C593E133A7B10'
+    }
+    TestFrame {
+        time: 1504
+        hash: '2703B617937914A90EA42EBF249D79EE'
+    }
+    TestFrame {
+        time: 1520
+        hash: 'B77E2983138254016C4CCA53100F46FA'
+    }
+    TestFrame {
+        time: 1536
+        hash: '60C4DD24187D1281081479E586F02B37'
+    }
+    TestFrame {
+        time: 1552
+        hash: '62F2511ABD99EF1231C9FA4B91D4ABFE'
+    }
+    TestFrame {
+        time: 1568
+        hash: 'E309B3353FD174E883D309571CADDC98'
+    }
+    TestFrame {
+        time: 1584
+        hash: '1E2D6A134C7B12DDE551B148EF4F088C'
+    }
+    TestFrame {
+        time: 1600
+        hash: 'E5DC5450604A491CC24A0DCF5C278B58'
+    }
+    TestFrame {
+        time: 1616
+        hash: 'C8DAE97C10E1962C1E6A51AB3AB8579E'
+    }
+    TestFrame {
+        time: 1632
+        hash: '4E1B7E06F55FB084080689B474F1FE1D'
+    }
+    TestFrame {
+        time: 1648
+        hash: 'B4639C907FA937BF15FAC62421170CD8'
+    }
+    TestFrame {
+        time: 1664
+        hash: 'C250208A0CAEB5F6CB4D3AAC3D7D350B'
+    }
+    TestFrame {
+        time: 1680
+        hash: 'A73351EABECF0D71149EFE31F197413E'
+    }
+    TestFrame {
+        time: 1696
+        hash: '479425F1B7AFF79E4DFB7FCA534AF018'
+    }
+    TestFrame {
+        time: 1712
+        hash: '046D0F0040A52D1F26BA9F7C5DE06EF4'
+    }
+    TestFrame {
+        time: 1728
+        hash: '655778BF13C6080903150B0EB43A7EDC'
+    }
+    TestFrame {
+        time: 1744
+        hash: '72DA0BBE81514870655FDD3354ADAC60'
+    }
+    TestFrame {
+        time: 1760
+        hash: 'DEFE0BDF675C65FFF55AAACED1E4DAE7'
+    }
+    TestFrame {
+        time: 1776
+        hash: 'C988628B6C3D3780E9A865C7694926CD'
+    }
+    TestFrame {
+        time: 1792
+        hash: '5AB17563655231089EDD986FF13D6012'
+    }
+    TestFrame {
+        time: 1808
+        hash: 'C1ADFF1D2E5800ED466D1691D3B17382'
+    }
+    TestFrame {
+        time: 1824
+        hash: '70129BA01FBB19592B9DC0D0A3B3E7DF'
+    }
+    TestFrame {
+        time: 1840
+        hash: '0000829EF7ED908BF430D42904D59CC2'
+    }
+    TestFrame {
+        time: 1856
+        hash: '843D2927F50AB87B4A86B7A6AAEED91F'
+    }
+    TestFrame {
+        time: 1872
+        hash: 'DA86D21756025E7DE8050586D5E2A1F8'
+    }
+    TestFrame {
+        time: 1888
+        hash: '48DD1BD6580133B0793FEE327EA4F1E6'
+    }
+    TestFrame {
+        time: 1904
+        hash: 'F0618193DCD0BA2837249515A1898B1C'
+    }
+    TestFrame {
+        time: 1920
+        hash: 'A530184E57251065286C0CBBA7301E9C'
+    }
+    TestFrame {
+        time: 1936
+        hash: '64A1D7203973D65DD342793007A61C58'
+    }
+    TestFrame {
+        time: 1952
+        hash: '5B830DFC6BA442772DE87D75D5A578DE'
+    }
+    TestFrame {
+        time: 1968
+        hash: '5563B056B0409B65F60DD16DD0DD890E'
+    }
+    TestFrame {
+        time: 1984
+        hash: 'B8BCF9AD2CA8720C11563A23D8280804'
+    }
+    TestFrame {
+        time: 2000
+        hash: '8C0FCDA4F8956394C53FC4BA18CAA850'
+    }
+}
diff --git a/tests/auto/declarative/visual/colorAnimation/image0.png b/tests/auto/declarative/visual/colorAnimation/image0.png
deleted file mode 100644
index 9e1caf7..0000000
--- a/tests/auto/declarative/visual/colorAnimation/image0.png
+++ /dev/null
diff --git a/tests/auto/declarative/visual/colorAnimation/manifest.xml b/tests/auto/declarative/visual/colorAnimation/manifest.xml
deleted file mode 100644
index 8e3de2e..0000000
--- a/tests/auto/declarative/visual/colorAnimation/manifest.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestLog>
-    <TestFullFrame time="30" frameId="0"/>
-    <TestMouse time="480" type="2" button="1" buttons="1" globalPos="93,129" pos="89,102"/>
-    <TestMouse time="570" type="3" button="1" buttons="0" globalPos="93,129" pos="89,102"/>
-    <TestFrame time="630" hash="D42762ECD293C6922C5F9593126DE636"/>
-    <TestFrame time="660" hash="8962505FCCB2E7559A99A8EDD325A82B"/>
-    <TestFrame time="690" hash="6812EFDA80607D4FA05CD3A5077F8EF7"/>
-    <TestFrame time="720" hash="A116DF73809679C1C5F9261F49B989F0"/>
-    <TestFrame time="750" hash="DC1B9D40AEE306171AD6625DDCA4EB45"/>
-    <TestFrame time="780" hash="B2DAF0E4C32080229664A8B0A155DE3B"/>
-    <TestFrame time="810" hash="496677B0D8707B91566D1244C46D50DB"/>
-    <TestFrame time="840" hash="A6558D8B0D1FB1D11BEBE36C078386CE"/>
-    <TestFrame time="870" hash="601436BB436D391B0BD5FCC289666208"/>
-    <TestFrame time="900" hash="8CF3CF9EAD875497870CC7C1035802DC"/>
-    <TestFrame time="930" hash="FF6BA6BAC30DADD3DBBFD96F127EB1FE"/>
-    <TestFrame time="960" hash="1D97A2A6890078DCF4CE9E508E5F9F08"/>
-    <TestFrame time="990" hash="58C9116FDDD03DD036820EFCD0DCD392"/>
-    <TestFrame time="1020" hash="E51287B911C140B41D350FCB2091AB80"/>
-    <TestFrame time="1050" hash="7B107411B436FABE469A069E6E5B0C3C"/>
-    <TestFrame time="1080" hash="9D1CB0E58F2BD00DDA0FB463F6BFF526"/>
-    <TestFrame time="1110" hash="35AB7788489B79E5A5C6F2BE11AFC9E1"/>
-    <TestFrame time="1140" hash="C82177AC4A7A497469292C5F0F8C4913"/>
-    <TestFrame time="1170" hash="18763D1B911FDC524DB9E7B2569FE984"/>
-    <TestFrame time="1200" hash="27F63572AAEF6D835272D5D65FCF608B"/>
-    <TestFrame time="1230" hash="585727CAEC1F83ADB9E422BAF058A622"/>
-    <TestFrame time="1260" hash="2C3BBFEFBE6E5FDA1905E9F50985E1B4"/>
-    <TestFrame time="1290" hash="81675C4ABB2696D960BC5F204F05F16B"/>
-    <TestFrame time="1320" hash="6D0F3CCC06EF1E3A895ECC9A8DE90039"/>
-    <TestFrame time="1350" hash="0BF36093CCAEA8BDAE96D4939A8DDE20"/>
-    <TestFrame time="1380" hash="5A1CBC68AB59977B65492B0F8A664418"/>
-    <TestFrame time="1410" hash="C35831A8C59D56193CED2C4AADB4DFCE"/>
-    <TestFrame time="1440" hash="ED15973425A8B8528896B344A61393AA"/>
-    <TestFrame time="1470" hash="EA8FC02A8606680C089F0C0CE454ABE3"/>
-    <TestFrame time="1500" hash="CFB5CFBA0A0BC62C0D03908FB9599A8E"/>
-    <TestFrame time="1530" hash="09FAA04AFB50B48BD6A83F9E25F9DDDB"/>
-    <TestFrame time="1560" hash="0FDD0B8CDCCEB78C7C67AB0F5EA74D6A"/>
-    <TestFrame time="1590" hash="058D26146879900B5E5CCE05AE38BA0E"/>
-    <TestFrame time="1620" hash="80F9074C50F967C99D4C3A3FF9EC3E71"/>
-    <TestFrame time="1650" hash="AD9BDCEEC1C058D6B658C5BA0D0BC1F0"/>
-    <TestFrame time="1680" hash="AC14DF5458F91001181154F8C68BCE2B"/>
-    <TestFrame time="1710" hash="AE9225263E4C8E75E4D0F1D7192B4260"/>
-    <TestFrame time="1740" hash="D3D50F1B7F476E79E5B99E0E6D4CF827"/>
-    <TestFrame time="1770" hash="A1367445C5232ACCBF4904A415416EA4"/>
-    <TestFrame time="1800" hash="A21C0F1DA9B64A5B000558BA1F2E495D"/>
-    <TestFrame time="1830" hash="61AF477B6FB22E38E698375EA5793D22"/>
-    <TestFrame time="1860" hash="B3AD3501D527939CEAA4F124AB10B2DF"/>
-    <TestFrame time="1890" hash="0C2BF65A43AE87AFB0068F9FA4A74707"/>
-    <TestFrame time="1920" hash="5B7F96C797BEE4FD1B04538DE5549C1B"/>
-    <TestFrame time="1950" hash="4C861E936A3F1AFE323395E30174F8CC"/>
-    <TestFrame time="1980" hash="87F1966E5B0E924EB7CEED5520D120BF"/>
-    <TestFrame time="2010" hash="1980755E0D80469D4DC0B9B0309F2DEB"/>
-    <TestFrame time="2040" hash="38A7ACC2E5607FC0965B7B376A0D3524"/>
-    <TestFrame time="2070" hash="4434746833EFF5A3A76491024763990A"/>
-    <TestFrame time="2100" hash="A8BAD928F92E851B45723068B7FEF739"/>
-    <TestFrame time="2130" hash="A96F5C522C0ECA5C78E982E4235218CB"/>
-    <TestFrame time="2160" hash="135F0EFEDE2832B76F49966EBD629879"/>
-    <TestFrame time="2190" hash="A51C6E443413F184CAAE8A7F98A369C8"/>
-    <TestFrame time="2220" hash="62A7521EE62E6A2543B3141C1EFCE72A"/>
-    <TestFrame time="2250" hash="D416A41125659167B3E6AD68F66F6E64"/>
-    <TestFrame time="2280" hash="0F653B5E965665A43F50437724DC704C"/>
-    <TestFrame time="2310" hash="13A6E2485179501FF3AA8BA91A5050B4"/>
-    <TestFrame time="2340" hash="9423475D3832FBABEC56B80FA9161020"/>
-    <TestFrame time="2370" hash="497B21108A6CB127DB066B32D06D992A"/>
-    <TestFrame time="2400" hash="22F01CB9B4F8FF01410566A61E281373"/>
-    <TestFrame time="2430" hash="A099640BC088E14E20585CB87FC5C6F1"/>
-    <TestFrame time="2460" hash="AC2954553C333EA1D524CE51CD35958A"/>
-    <TestFrame time="2490" hash="771E882CC788BECAA82E71E6FBAB150D"/>
-    <TestFrame time="2520" hash="42CEDA45D88A8D2B3DA5B749F4C3C1BF"/>
-    <TestFrame time="2550" hash="C6E1F91B917E47246E012D1B203E0DC2"/>
-    <TestFrame time="2580" hash="EFB3E57CF265B6E36AA4DF72771D119C"/>
-    <TestFrame time="2610" hash="657FC7FD496E5A2FC84F63930E0D1DE3"/>
-</TestLog>
diff --git a/tests/auto/declarative/visual/easing/easing.qml b/tests/auto/declarative/visual/easing/easing.qml
new file mode 100644
index 0000000..4a0ed14
--- /dev/null
+++ b/tests/auto/declarative/visual/easing/easing.qml
@@ -0,0 +1,186 @@
+Rect {
+    id: item
+    width: 600
+    height: layout.height
+    color: "white"
+    resources: [
+        ListModel {
+            id: easingtypes
+            ListElement {
+                type: "easeNone"
+            }
+            ListElement {
+                type: "easeInQuad"
+            }
+            ListElement {
+                type: "easeOutQuad"
+            }
+            ListElement {
+                type: "easeInOutQuad"
+            }
+            ListElement {
+                type: "easeOutInQuad"
+            }
+            ListElement {
+                type: "easeInCubic"
+            }
+            ListElement {
+                type: "easeOutCubic"
+            }
+            ListElement {
+                type: "easeInOutCubic"
+            }
+            ListElement {
+                type: "easeOutInCubic"
+            }
+            ListElement {
+                type: "easeInQuart"
+            }
+            ListElement {
+                type: "easeOutQuart"
+            }
+            ListElement {
+                type: "easeInOutQuart"
+            }
+            ListElement {
+                type: "easeOutInQuart"
+            }
+            ListElement {
+                type: "easeInQuint"
+            }
+            ListElement {
+                type: "easeOutQuint"
+            }
+            ListElement {
+                type: "easeInOutQuint"
+            }
+            ListElement {
+                type: "easeOutInQuint"
+            }
+            ListElement {
+                type: "easeInSine"
+            }
+            ListElement {
+                type: "easeOutSine"
+            }
+            ListElement {
+                type: "easeInOutSine"
+            }
+            ListElement {
+                type: "easeOutInSine"
+            }
+            ListElement {
+                type: "easeInExpo"
+            }
+            ListElement {
+                type: "easeOutExpo"
+            }
+            ListElement {
+                type: "easeInOutExpo"
+            }
+            ListElement {
+                type: "easeOutInExpo"
+            }
+            ListElement {
+                type: "easeInCirc"
+            }
+            ListElement {
+                type: "easeOutCirc"
+            }
+            ListElement {
+                type: "easeInOutCirc"
+            }
+            ListElement {
+                type: "easeOutInCirc"
+            }
+            ListElement {
+                type: "easeInElastic"
+            }
+            ListElement {
+                type: "easeOutElastic"
+            }
+            ListElement {
+                type: "easeInOutElastic"
+            }
+            ListElement {
+                type: "easeOutInElastic"
+            }
+            ListElement {
+                type: "easeInBack"
+            }
+            ListElement {
+                type: "easeOutBack"
+            }
+            ListElement {
+                type: "easeInOutBack"
+            }
+            ListElement {
+                type: "easeOutInBack"
+            }
+            ListElement {
+                type: "easeOutBounce"
+            }
+            ListElement {
+                type: "easeInBounce"
+            }
+            ListElement {
+                type: "easeInOutBounce"
+            }
+            ListElement {
+                type: "easeOutInBounce"
+            }
+        }
+    ]
+    VerticalLayout {
+        id: layout
+        anchors.left: item.left
+        anchors.right: item.right
+        Repeater {
+            dataSource: easingtypes
+            Component {
+                Text {
+                    id: text
+                    text: type
+                    height: 18
+                    font.italic: true
+                    color: "black"
+                    states: [
+                        State {
+                            name: "from"
+                            when: !mouse.pressed
+                            SetProperty {
+                                target: text
+                                property: "x"
+                                value: 0
+                            }
+                        },
+                        State {
+                            name: "to"
+                            when: mouse.pressed
+                            SetProperty {
+                                target: text
+                                property: "x"
+                                value: item.width-100
+                            }
+                        }
+                    ]
+                    transitions: [
+                        Transition {
+                            fromState: "*"
+                            toState: "to"
+                            reversible: true
+                            NumericAnimation {
+                                properties: "x"
+                                easing: type
+                            }
+                        }
+                    ]
+                }
+            }
+        }
+    }
+    MouseRegion {
+        id: mouse
+        anchors.fill: layout
+    }
+}
diff --git a/tests/auto/declarative/visual/easing/easing.xml b/tests/auto/declarative/visual/easing/easing.xml
deleted file mode 100644
index 01a7d6c..0000000
--- a/tests/auto/declarative/visual/easing/easing.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<Rect id="item" width="600" height="{layout.height}" color="white">
-  <resources>
-   <ListModel id="easingtypes">
-    <ListItem><type>easeNone</type></ListItem>
-    <ListItem><type>easeInQuad</type></ListItem>
-    <ListItem><type>easeOutQuad</type></ListItem>
-    <ListItem><type>easeInOutQuad</type></ListItem>
-    <ListItem><type>easeOutInQuad</type></ListItem>
-    <ListItem><type>easeInCubic</type></ListItem>
-    <ListItem><type>easeOutCubic</type></ListItem>
-    <ListItem><type>easeInOutCubic</type></ListItem>
-    <ListItem><type>easeOutInCubic</type></ListItem>
-    <ListItem><type>easeInQuart</type></ListItem>
-    <ListItem><type>easeOutQuart</type></ListItem>
-    <ListItem><type>easeInOutQuart</type></ListItem>
-    <ListItem><type>easeOutInQuart</type></ListItem>
-    <ListItem><type>easeInQuint</type></ListItem>
-    <ListItem><type>easeOutQuint</type></ListItem>
-    <ListItem><type>easeInOutQuint</type></ListItem>
-    <ListItem><type>easeOutInQuint</type></ListItem>
-    <ListItem><type>easeInSine</type></ListItem>
-    <ListItem><type>easeOutSine</type></ListItem>
-    <ListItem><type>easeInOutSine</type></ListItem>
-    <ListItem><type>easeOutInSine</type></ListItem>
-    <ListItem><type>easeInExpo</type></ListItem>
-    <ListItem><type>easeOutExpo</type></ListItem>
-    <ListItem><type>easeInOutExpo</type></ListItem>
-    <ListItem><type>easeOutInExpo</type></ListItem>
-    <ListItem><type>easeInCirc</type></ListItem>
-    <ListItem><type>easeOutCirc</type></ListItem>
-    <ListItem><type>easeInOutCirc</type></ListItem>
-    <ListItem><type>easeOutInCirc</type></ListItem>
-    <ListItem><type>easeInElastic</type></ListItem>
-    <ListItem><type>easeOutElastic</type></ListItem>
-    <ListItem><type>easeInOutElastic</type></ListItem>
-    <ListItem><type>easeOutInElastic</type></ListItem>
-    <ListItem><type>easeInBack</type></ListItem>
-    <ListItem><type>easeOutBack</type></ListItem>
-    <ListItem><type>easeInOutBack</type></ListItem>
-    <ListItem><type>easeOutInBack</type></ListItem>
-    <ListItem><type>easeOutBounce</type></ListItem>
-    <ListItem><type>easeInBounce</type></ListItem>
-    <ListItem><type>easeInOutBounce</type></ListItem>
-    <ListItem><type>easeOutInBounce</type></ListItem>
-   </ListModel>
-  </resources>
-
-  <VerticalLayout id="layout" anchors.left="{item.left}" anchors.right="{item.right}">
-    <Repeater dataSource="{easingtypes}" >
-        <Component>
-            <Text id="text" text="{type}" height="18" font.italic="true" color="black">
-                <states>
-                    <State name="from" when="{!mouse.pressed}">
-                        <SetProperty target="{text}" property="x" value="0"/>
-                    </State>
-                    <State name="to" when="{mouse.pressed}">
-                        <SetProperty target="{text}" property="x" value="{item.width-100}"/>
-                    </State>
-                </states>
-                <transitions>
-                    <Transition fromState="*" toState="to" reversible="true">
-                        <NumericAnimation properties="x" easing="{type}" />
-                    </Transition>
-                </transitions>
-            </Text>
-        </Component>
-    </Repeater>
-  </VerticalLayout>
-  <MouseRegion id="mouse" anchors.fill="{layout}"/>
-</Rect>
diff --git a/tests/auto/declarative/visual/flickable/Day.qml b/tests/auto/declarative/visual/flickable/Day.qml
index 0765e2f..63fbc78 100644
--- a/tests/auto/declarative/visual/flickable/Day.qml
+++ b/tests/auto/declarative/visual/flickable/Day.qml
@@ -1,8 +1,26 @@
-<Rect width="400" height="500" radius="7" pen.color="black" id="Page">
-    <properties>
-        <Property name="day" type="string" />
-    </properties>
+Rect {
+    property string day
 
-    <Image x="10" y="10" file="cork.jpg" opaque="true"/>
-    <Text x="20" y="20" height="40" font.size="14" font.bold="true" width="370" text="{day}" style="Outline" styleColor="#dedede"/>
-</Rect>
+    width: 400
+    height: 500
+    radius: 7
+    pen.color: "black"
+    id: Page
+    Image {
+        x: 10
+        y: 10
+        source: "cork.jpg"
+        opaque: true
+    }
+    Text {
+        x: 20
+        y: 20
+        height: 40
+        font.size: 14
+        font.bold: true
+        width: 370
+        text: day
+        style: "Outline"
+        styleColor: "#dedede"
+    }
+}
diff --git a/tests/auto/declarative/visual/flickable/flickable.qml b/tests/auto/declarative/visual/flickable/flickable.qml
new file mode 100644
index 0000000..5946c40
--- /dev/null
+++ b/tests/auto/declarative/visual/flickable/flickable.qml
@@ -0,0 +1,53 @@
+Rect {
+    color: "lightSteelBlue"
+    width: 800
+    height: 500
+    ListModel {
+        id: List
+        ListElement {
+            name: "Sunday"
+            dayColor: "#808080"
+        }
+        ListElement {
+            name: "Monday"
+            dayColor: "blue"
+        }
+        ListElement {
+            name: "Tuesday"
+            dayColor: "yellow"
+        }
+        ListElement {
+            name: "Wednesday"
+            dayColor: "purple"
+        }
+        ListElement {
+            name: "Thursday"
+            dayColor: "blue"
+        }
+        ListElement {
+            name: "Friday"
+            dayColor: "green"
+        }
+        ListElement {
+            name: "Saturday"
+            dayColor: "orange"
+        }
+    }
+    Flickable {
+        id: Flick
+        anchors.fill: parent
+        viewportWidth: Lay.width
+        HorizontalLayout {
+            id: Lay
+            Repeater {
+                dataSource: List
+                Component {
+                    Day {
+                        day: name
+                        color: dayColor
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/visual/flickable/flickable.xml b/tests/auto/declarative/visual/flickable/flickable.xml
deleted file mode 100644
index 78bf42f..0000000
--- a/tests/auto/declarative/visual/flickable/flickable.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<Rect color="lightSteelBlue" width="800" height="500">
-    <ListModel id="List">
-        <Day>
-            <name>Sunday</name>
-            <dayColor>#808080</dayColor>
-        </Day>
-        <Day>
-            <name>Monday</name>
-            <dayColor>blue</dayColor>
-        </Day>
-        <Day>
-            <name>Tuesday</name>
-            <dayColor>yellow</dayColor>
-        </Day>
-        <Day>
-            <name>Wednesday</name>
-            <dayColor>purple</dayColor>
-        </Day>
-        <Day>
-            <name>Thursday</name>
-            <dayColor>blue</dayColor>
-        </Day>
-        <Day>
-            <name>Friday</name>
-            <dayColor>green</dayColor>
-        </Day>
-        <Day>
-            <name>Saturday</name>
-            <dayColor>orange</dayColor>
-        </Day>
-    </ListModel>
-
-    <Flickable id="Flick" anchors.fill="{parent}" viewportWidth="{Lay.width}">
-        <HorizontalLayout id="Lay">
-            <Repeater dataSource="{List}">
-                <Component>
-                    <Day day="{name}" color="{dayColor}" />
-                </Component>
-            </Repeater>
-        </HorizontalLayout>
-    </Flickable>
-
-</Rect>
diff --git a/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.qml b/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.qml
new file mode 100644
index 0000000..5c00f58
--- /dev/null
+++ b/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.qml
@@ -0,0 +1,28 @@
+Rect {
+    id: rect
+    width: 120
+    height: 200
+    color: "white"
+    Image {
+        id: img
+        source: "pics/qtlogo.png"
+        x: 60-width/2
+        y: 200-height
+        y: SequentialAnimation {
+            running: true
+            repeat: true
+            NumericAnimation {
+                to: 0; duration: 500
+                easing: "easeInOutQuad"
+            }
+            NumericAnimation {
+                to: 200-img.height
+                easing: "easeOutBounce"
+                duration: 2000
+            }
+            PauseAnimation {
+                duration: 1000
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.xml b/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.xml
deleted file mode 100644
index bb411e2..0000000
--- a/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Rect id="rect" width="120" height="200" color="white">
-    <Image id="img" file="pics/qtlogo.png"
-            x="{60-img.width/2}" y="{200-img.height}">
-        <y>
-            <SerialAnimation running="true" repeat="true">
-                <NumericAnimation to="{200-img.height}"
-                    easing="easeOutBounce(amplitude:100)"
-                    duration="2000" />
-                <PauseAnimation duration="1000" />
-            </SerialAnimation>
-        </y>
-    </Image>
-</Rect>
diff --git a/tests/auto/declarative/visual/qfxtext/elide/data/opengl/image0.png b/tests/auto/declarative/visual/qfxtext/elide/data/opengl/image0.png
deleted file mode 100644
index 7d45407..0000000
--- a/tests/auto/declarative/visual/qfxtext/elide/data/opengl/image0.png
+++ /dev/null
diff --git a/tests/auto/declarative/visual/qfxtext/elide/data/opengl/manifest.xml b/tests/auto/declarative/visual/qfxtext/elide/data/opengl/manifest.xml
deleted file mode 100644
index b784f42..0000000
--- a/tests/auto/declarative/visual/qfxtext/elide/data/opengl/manifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestLog>
-    <TestFullFrame time="30" frameId="0"/>
-</TestLog>
diff --git a/tests/auto/declarative/visual/qfxtext/elide/data/raster/image0.png b/tests/auto/declarative/visual/qfxtext/elide/data/raster/image0.png
new file mode 100644
index 0000000..05dc9ab
--- /dev/null
+++ b/tests/auto/declarative/visual/qfxtext/elide/data/raster/image0.png
diff --git a/tests/auto/declarative/visual/qfxtext/elide/data/raster/manifest.qml b/tests/auto/declarative/visual/qfxtext/elide/data/raster/manifest.qml
new file mode 100644
index 0000000..6d900f5
--- /dev/null
+++ b/tests/auto/declarative/visual/qfxtext/elide/data/raster/manifest.qml
@@ -0,0 +1,6 @@
+TestLog {
+    TestFullFrame {
+        time: 0
+        frameId: 0
+        }
+}
diff --git a/tests/auto/declarative/visual/qfxtext/elide/elide.qml b/tests/auto/declarative/visual/qfxtext/elide/elide.qml
new file mode 100644
index 0000000..23e6885
--- /dev/null
+++ b/tests/auto/declarative/visual/qfxtext/elide/elide.qml
@@ -0,0 +1,33 @@
+Rect {
+    width: contents.width
+    height: contents.height
+    VerticalLayout {
+        width: 80
+        height: Text.height*4
+        Text {
+            elide: "ElideLeft"
+            text: "aaa bbb ccc ddd eee fff"
+            width: 80
+            color: "white"
+            id: Text
+        }
+        Text {
+            elide: "ElideMiddle"
+            text: "aaa bbb ccc ddd eee fff"
+            width: 80
+            color: "white"
+        }
+        Text {
+            elide: "ElideRight"
+            text: "aaa bbb ccc ddd eee fff"
+            width: 80
+            color: "white"
+        }
+        Text {
+            elide: "ElideNone"
+            text: "aaa bbb ccc ddd eee fff"
+            width: 80
+            color: "white"
+        }
+    }
+}
diff --git a/tests/auto/declarative/visual/qfxtext/elide/elide.xml b/tests/auto/declarative/visual/qfxtext/elide/elide.xml
deleted file mode 100644
index 398da82..0000000
--- a/tests/auto/declarative/visual/qfxtext/elide/elide.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<VerticalLayout width="80" height="{Text.height*4}">
-    <Text elide="ElideLeft" text="aaa bbb ccc ddd eee fff" width="80" color="white" id="Text"/>
-    <Text elide="ElideMiddle" text="aaa bbb ccc ddd eee fff" width="80" color="white"/>
-    <Text elide="ElideRight" text="aaa bbb ccc ddd eee fff" width="80" color="white"/>
-    <Text elide="ElideNone" text="aaa bbb ccc ddd eee fff" width="80" color="white"/>
-</VerticalLayout>
diff --git a/tests/auto/declarative/visual/qfxtext/elide/test b/tests/auto/declarative/visual/qfxtext/elide/test
index d35cbc9..bde7c7c 100644
--- a/tests/auto/declarative/visual/qfxtext/elide/test
+++ b/tests/auto/declarative/visual/qfxtext/elide/test
@@ -1 +1 @@
-elide.xml
+elide.qml
diff --git a/tests/auto/declarative/visual/repeater/basic1/basic1.qml b/tests/auto/declarative/visual/repeater/basic1/basic1.qml
new file mode 100644
index 0000000..ba8f44d
--- /dev/null
+++ b/tests/auto/declarative/visual/repeater/basic1/basic1.qml
@@ -0,0 +1,26 @@
+Rect {
+    color: "blue"
+    width: 300
+    height: 200
+    id: Page
+    HorizontalLayout {
+        Repeater {
+            component: Rect {
+                color: "red"
+                width: 100
+                height: 100
+                Text {
+                    text: name
+                }
+            }
+            dataSource: ListModel {
+                ListElement {
+                    name: "January"
+                }
+                ListElement {
+                    name: "February"
+                }
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/visual/repeater/basic1/basic1.xml b/tests/auto/declarative/visual/repeater/basic1/basic1.xml
deleted file mode 100644
index def809f..0000000
--- a/tests/auto/declarative/visual/repeater/basic1/basic1.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Rect color="blue" width="800" height="600" id="Page">
-    <HorizontalLayout>
-        <Repeater >
-            <component>
-                <Rect color="red" width="100" height="100">
-                    <Text text="{name}" />
-                </Rect>
-            </component>
-            <dataSource>
-                <ListModel>
-                    <Month>
-                        <name>January</name>
-                    </Month>
-                    <Month>
-                        <name>February</name>
-                    </Month>
-                </ListModel>
-            </dataSource>
-        </Repeater>
-    </HorizontalLayout>
-</Rect>
diff --git a/tests/auto/declarative/visual/repeater/basic1/data/opengl/image0.png b/tests/auto/declarative/visual/repeater/basic1/data/opengl/image0.png
deleted file mode 100644
index f0be97f..0000000
--- a/tests/auto/declarative/visual/repeater/basic1/data/opengl/image0.png
+++ /dev/null
diff --git a/tests/auto/declarative/visual/repeater/basic1/data/opengl/manifest.xml b/tests/auto/declarative/visual/repeater/basic1/data/opengl/manifest.xml
deleted file mode 100644
index b784f42..0000000
--- a/tests/auto/declarative/visual/repeater/basic1/data/opengl/manifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestLog>
-    <TestFullFrame time="30" frameId="0"/>
-</TestLog>
diff --git a/tests/auto/declarative/visual/repeater/basic1/data/raster/image0.png b/tests/auto/declarative/visual/repeater/basic1/data/raster/image0.png
new file mode 100644
index 0000000..868eaa3
--- /dev/null
+++ b/tests/auto/declarative/visual/repeater/basic1/data/raster/image0.png
diff --git a/tests/auto/declarative/visual/repeater/basic1/data/raster/manifest.qml b/tests/auto/declarative/visual/repeater/basic1/data/raster/manifest.qml
new file mode 100644
index 0000000..6d900f5
--- /dev/null
+++ b/tests/auto/declarative/visual/repeater/basic1/data/raster/manifest.qml
@@ -0,0 +1,6 @@
+TestLog {
+    TestFullFrame {
+        time: 0
+        frameId: 0
+        }
+}
diff --git a/tests/auto/declarative/visual/repeater/basic1/test b/tests/auto/declarative/visual/repeater/basic1/test
index 62f0665..49fcf5a 100644
--- a/tests/auto/declarative/visual/repeater/basic1/test
+++ b/tests/auto/declarative/visual/repeater/basic1/test
@@ -1 +1 @@
-basic1.xml
+basic1.qml
diff --git a/tests/auto/declarative/visual/repeater/basic2/basic2.qml b/tests/auto/declarative/visual/repeater/basic2/basic2.qml
new file mode 100644
index 0000000..d975ea4
--- /dev/null
+++ b/tests/auto/declarative/visual/repeater/basic2/basic2.qml
@@ -0,0 +1,30 @@
+Rect {
+    color: "blue"
+    width: 300
+    height: 200
+    id: Page
+    Component {
+        id: Delegate
+        Rect {
+            color: "red"
+            width: 100
+            height: 100
+            Text {
+                text: name
+            }
+        }
+    }
+    HorizontalLayout {
+        Repeater {
+            component: Delegate
+            dataSource: ListModel {
+                ListElement {
+                    name: "January"
+                }
+                ListElement {
+                    name: "February"
+                }
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/visual/repeater/basic2/basic2.xml b/tests/auto/declarative/visual/repeater/basic2/basic2.xml
deleted file mode 100644
index b16fbfe..0000000
--- a/tests/auto/declarative/visual/repeater/basic2/basic2.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<Rect color="blue" width="800" height="600" id="Page">
-    <Component id="Delegate">
-        <Rect color="red" width="100" height="100">
-            <Text text="{name}" />
-        </Rect>
-    </Component>
-
-    <HorizontalLayout>
-        <Repeater component="{Delegate}">
-            <dataSource>
-                <ListModel>
-                    <Month>
-                        <name>January</name>
-                    </Month>
-                    <Month>
-                        <name>February</name>
-                    </Month>
-                </ListModel>
-            </dataSource>
-        </Repeater>
-    </HorizontalLayout>
-</Rect>
diff --git a/tests/auto/declarative/visual/repeater/basic2/data/opengl/image0.png b/tests/auto/declarative/visual/repeater/basic2/data/opengl/image0.png
deleted file mode 100644
index f0be97f..0000000
--- a/tests/auto/declarative/visual/repeater/basic2/data/opengl/image0.png
+++ /dev/null
diff --git a/tests/auto/declarative/visual/repeater/basic2/data/opengl/manifest.xml b/tests/auto/declarative/visual/repeater/basic2/data/opengl/manifest.xml
deleted file mode 100644
index b784f42..0000000
--- a/tests/auto/declarative/visual/repeater/basic2/data/opengl/manifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestLog>
-    <TestFullFrame time="30" frameId="0"/>
-</TestLog>
diff --git a/tests/auto/declarative/visual/repeater/basic2/data/raster/image0.png b/tests/auto/declarative/visual/repeater/basic2/data/raster/image0.png
new file mode 100644
index 0000000..868eaa3
--- /dev/null
+++ b/tests/auto/declarative/visual/repeater/basic2/data/raster/image0.png
diff --git a/tests/auto/declarative/visual/repeater/basic2/data/raster/manifest.qml b/tests/auto/declarative/visual/repeater/basic2/data/raster/manifest.qml
new file mode 100644
index 0000000..6d900f5
--- /dev/null
+++ b/tests/auto/declarative/visual/repeater/basic2/data/raster/manifest.qml
@@ -0,0 +1,6 @@
+TestLog {
+    TestFullFrame {
+        time: 0
+        frameId: 0
+        }
+}
diff --git a/tests/auto/declarative/visual/repeater/basic2/test b/tests/auto/declarative/visual/repeater/basic2/test
index ae974fe..eb79495 100644
--- a/tests/auto/declarative/visual/repeater/basic2/test
+++ b/tests/auto/declarative/visual/repeater/basic2/test
@@ -1 +1 @@
-basic2.xml
+basic2.qml
diff --git a/tests/auto/declarative/visual/repeater/basic3/basic3.qml b/tests/auto/declarative/visual/repeater/basic3/basic3.qml
new file mode 100644
index 0000000..cecba33
--- /dev/null
+++ b/tests/auto/declarative/visual/repeater/basic3/basic3.qml
@@ -0,0 +1,28 @@
+Rect {
+    color: "blue"
+    width: 300
+    height: 200
+    id: Page
+    ListModel {
+        id: DataSource
+        ListElement {
+            name: "January"
+        }
+        ListElement {
+            name: "February"
+        }
+    }
+    HorizontalLayout {
+        Repeater {
+            dataSource: DataSource
+            component: Rect {
+                color: "red"
+                width: 100
+                height: 100
+                Text {
+                    text: name
+                }
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/visual/repeater/basic3/basic3.xml b/tests/auto/declarative/visual/repeater/basic3/basic3.xml
deleted file mode 100644
index 1135f16..0000000
--- a/tests/auto/declarative/visual/repeater/basic3/basic3.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Rect color="blue" width="800" height="600" id="Page">
-    <ListModel id="DataSource">
-        <Month>
-            <name>January</name>
-        </Month>
-        <Month>
-            <name>February</name>
-        </Month>
-    </ListModel>
-    <HorizontalLayout>
-        <Repeater dataSource="{DataSource}">
-            <component>
-                <Rect color="red" width="100" height="100">
-                    <Text text="{name}" />
-                </Rect>
-            </component>
-        </Repeater>
-    </HorizontalLayout>
-</Rect>
diff --git a/tests/auto/declarative/visual/repeater/basic3/data/opengl/image0.png b/tests/auto/declarative/visual/repeater/basic3/data/opengl/image0.png
deleted file mode 100644
index f0be97f..0000000
--- a/tests/auto/declarative/visual/repeater/basic3/data/opengl/image0.png
+++ /dev/null
diff --git a/tests/auto/declarative/visual/repeater/basic3/data/opengl/manifest.xml b/tests/auto/declarative/visual/repeater/basic3/data/opengl/manifest.xml
deleted file mode 100644
index b784f42..0000000
--- a/tests/auto/declarative/visual/repeater/basic3/data/opengl/manifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestLog>
-    <TestFullFrame time="30" frameId="0"/>
-</TestLog>
diff --git a/tests/auto/declarative/visual/repeater/basic3/data/raster/image0.png b/tests/auto/declarative/visual/repeater/basic3/data/raster/image0.png
new file mode 100644
index 0000000..868eaa3
--- /dev/null
+++ b/tests/auto/declarative/visual/repeater/basic3/data/raster/image0.png
diff --git a/tests/auto/declarative/visual/repeater/basic3/data/raster/manifest.qml b/tests/auto/declarative/visual/repeater/basic3/data/raster/manifest.qml
new file mode 100644
index 0000000..47d36c3
--- /dev/null
+++ b/tests/auto/declarative/visual/repeater/basic3/data/raster/manifest.qml
@@ -0,0 +1,13 @@
+TestLog {
+    TestFullFrame {
+        time: 0
+        frameId: 0
+        }
+    TestKey {
+        time: 1296
+        type: 6
+        modifiers: 0
+        key: 16777251
+        text: ''
+    }
+}
diff --git a/tests/auto/declarative/visual/repeater/basic3/test b/tests/auto/declarative/visual/repeater/basic3/test
index ea3154e..9ec306b 100644
--- a/tests/auto/declarative/visual/repeater/basic3/test
+++ b/tests/auto/declarative/visual/repeater/basic3/test
@@ -1 +1 @@
-basic3.xml
+basic3.qml
diff --git a/tests/auto/declarative/visual/repeater/basic4/basic4.qml b/tests/auto/declarative/visual/repeater/basic4/basic4.qml
new file mode 100644
index 0000000..050a2c5
--- /dev/null
+++ b/tests/auto/declarative/visual/repeater/basic4/basic4.qml
@@ -0,0 +1,32 @@
+Rect {
+    color: "blue"
+    width: 300
+    height: 200
+    id: Page
+    ListModel {
+        id: DataSource
+        ListElement {
+            name: "January"
+        }
+        ListElement {
+            name: "February"
+        }
+    }
+    Component {
+        id: Delegate
+        Rect {
+            color: "red"
+            width: 100
+            height: 100
+            Text {
+                text: name
+            }
+        }
+    }
+    HorizontalLayout {
+        Repeater {
+            dataSource: DataSource
+            component: Delegate
+        }
+    }
+}
diff --git a/tests/auto/declarative/visual/repeater/basic4/basic4.xml b/tests/auto/declarative/visual/repeater/basic4/basic4.xml
deleted file mode 100644
index 53b8ff9..0000000
--- a/tests/auto/declarative/visual/repeater/basic4/basic4.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Rect color="blue" width="800" height="600" id="Page">
-    <ListModel id="DataSource">
-        <Month>
-            <name>January</name>
-        </Month>
-        <Month>
-            <name>February</name>
-        </Month>
-    </ListModel>
-    <Component id="Delegate">
-        <Rect color="red" width="100" height="100">
-            <Text text="{name}" />
-        </Rect>
-    </Component>
-    <HorizontalLayout>
-        <Repeater dataSource="{DataSource}" component="{Delegate}" />
-    </HorizontalLayout>
-</Rect>
diff --git a/tests/auto/declarative/visual/repeater/basic4/data/opengl/image0.png b/tests/auto/declarative/visual/repeater/basic4/data/opengl/image0.png
deleted file mode 100644
index f0be97f..0000000
--- a/tests/auto/declarative/visual/repeater/basic4/data/opengl/image0.png
+++ /dev/null
diff --git a/tests/auto/declarative/visual/repeater/basic4/data/opengl/manifest.xml b/tests/auto/declarative/visual/repeater/basic4/data/opengl/manifest.xml
deleted file mode 100644
index b784f42..0000000
--- a/tests/auto/declarative/visual/repeater/basic4/data/opengl/manifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestLog>
-    <TestFullFrame time="30" frameId="0"/>
-</TestLog>
diff --git a/tests/auto/declarative/visual/repeater/basic4/data/raster/image0.png b/tests/auto/declarative/visual/repeater/basic4/data/raster/image0.png
new file mode 100644
index 0000000..868eaa3
--- /dev/null
+++ b/tests/auto/declarative/visual/repeater/basic4/data/raster/image0.png
diff --git a/tests/auto/declarative/visual/repeater/basic4/data/raster/manifest.qml b/tests/auto/declarative/visual/repeater/basic4/data/raster/manifest.qml
new file mode 100644
index 0000000..6d900f5
--- /dev/null
+++ b/tests/auto/declarative/visual/repeater/basic4/data/raster/manifest.qml
@@ -0,0 +1,6 @@
+TestLog {
+    TestFullFrame {
+        time: 0
+        frameId: 0
+        }
+}
diff --git a/tests/auto/declarative/visual/repeater/basic4/test b/tests/auto/declarative/visual/repeater/basic4/test
index 891e0be..2a7f227 100644
--- a/tests/auto/declarative/visual/repeater/basic4/test
+++ b/tests/auto/declarative/visual/repeater/basic4/test
@@ -1 +1 @@
-basic4.xml
+basic4.qml
diff --git a/tests/auto/declarative/visual/runtests.sh b/tests/auto/declarative/visual/runtests.sh
index f690381..4380884 100755
--- a/tests/auto/declarative/visual/runtests.sh
+++ b/tests/auto/declarative/visual/runtests.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+export QFX_USE_SIMPLECANVAS=1
 for a in `cat tests`; do ./tst_visual -testdir $a; done
diff --git a/tests/auto/declarative/visual/tst_visual.cpp b/tests/auto/declarative/visual/tst_visual.cpp
index f077994..f540e62 100644
--- a/tests/auto/declarative/visual/tst_visual.cpp
+++ b/tests/auto/declarative/visual/tst_visual.cpp
@@ -25,7 +25,9 @@ void tst_visual::visual()
 {
     QVERIFY(!testdir.isEmpty());
 
-    QFile configFile(QLatin1String(QT_TEST_SOURCE_DIR) + "/" + testdir + "/test");
+    QString filename = QLatin1String(QT_TEST_SOURCE_DIR) + "/" + testdir + "/test";
+    qWarning() << "Using config:" << filename;
+    QFile configFile(filename);
     QVERIFY(configFile.open(QIODevice::ReadOnly));
 
     QString testfile = configFile.readLine().trimmed();
author	Michael Brasser <michael.brasser@nokia.com>	2009-05-22 01:11:46 (GMT)
committer	Michael Brasser <michael.brasser@nokia.com>	2009-05-22 01:11:46 (GMT)
commit	47318932fc44428fc698fc5d4366e9b59f5c7fb9 (patch)
tree	7357009416021728fcf1bb3163f0841cc7e946e9 /tests/auto/declarative
parent	61943383ccff409d60d9837d58e4372dc6f22f23 (diff)
parent	5a506eefe1ca8f654dcfc354f8ac39547510becf (diff)
download	Qt-47318932fc44428fc698fc5d4366e9b59f5c7fb9.zip Qt-47318932fc44428fc698fc5d4366e9b59f5c7fb9.tar.gz Qt-47318932fc44428fc698fc5d4366e9b59f5c7fb9.tar.bz2