Merge remote branch 'origin/4.7' into qt-4.7-from-4.6

Conflicts:
	mkspecs/common/symbian/symbian.conf
	src/3rdparty/webkit/WebCore/WebCore.pro

746 files changed, 898 insertions, 363 deletions

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index eb74244..6c5a75f 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -59,7 +59,8 @@ SUBDIRS += \
            qdeclarativexmlhttprequest \      # Cover
            qdeclarativeimageprovider \       # Cover
            qdeclarativestyledtext \          # Cover
-           sql                      # Cover
+           sql \                      # Cover
+           qmlvisual
 
 contains(QT_CONFIG, webkit) {
     SUBDIRS += \
diff --git a/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp b/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
index 0bf0b81..26c8231 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
+++ b/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
@@ -82,6 +82,8 @@ void tst_qdeclarativebehaviors::simpleBehavior()
     QTest::qWait(200);
     qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
     QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
+
+    delete rect;
 }
 
 void tst_qdeclarativebehaviors::scriptTriggered()
@@ -95,6 +97,8 @@ void tst_qdeclarativebehaviors::scriptTriggered()
     QTest::qWait(200);
     qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
     QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
+
+    delete rect;
 }
 
 void tst_qdeclarativebehaviors::cppTriggered()
@@ -111,6 +115,8 @@ void tst_qdeclarativebehaviors::cppTriggered()
     QTest::qWait(200);
     qreal x = innerRect->x();
     QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
+
+    delete rect;
 }
 
 void tst_qdeclarativebehaviors::loop()
@@ -122,6 +128,8 @@ void tst_qdeclarativebehaviors::loop()
 
     //don't crash
     rect->setState("moved");
+
+    delete rect;
 }
 
 void tst_qdeclarativebehaviors::colorBehavior()
@@ -135,6 +143,8 @@ void tst_qdeclarativebehaviors::colorBehavior()
     QTest::qWait(200);
     QColor color = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->color();
     QVERIFY(color != QColor("red") && color != QColor("green"));  //i.e. the behavior has been triggered
+
+    delete rect;
 }
 
 void tst_qdeclarativebehaviors::parentBehavior()
@@ -152,6 +162,8 @@ void tst_qdeclarativebehaviors::parentBehavior()
     QTest::qWait(600);
     parent = rect->findChild<QDeclarativeRectangle*>("MyRect")->parentItem();
     QVERIFY(parent == newParent);
+
+    delete rect;
 }
 
 void tst_qdeclarativebehaviors::replaceBinding()
@@ -186,6 +198,8 @@ void tst_qdeclarativebehaviors::replaceBinding()
     rect->setProperty("basex", 20);
     QTest::qWait(600);
     QCOMPARE(innerRect->x(), (qreal)20);
+
+    delete rect;
 }
 
 void tst_qdeclarativebehaviors::group()
@@ -200,6 +214,8 @@ void tst_qdeclarativebehaviors::group()
         QTest::qWait(200);
         qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
         QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
+
+        delete rect;
     }
 
     {
@@ -212,6 +228,8 @@ void tst_qdeclarativebehaviors::group()
         QTest::qWait(200);
         qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
         QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
+
+        delete rect;
     }
 }
 
@@ -225,6 +243,8 @@ void tst_qdeclarativebehaviors::emptyBehavior()
     rect->setState("moved");
     qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
     QCOMPARE(x, qreal(200));    //should change immediately
+
+    delete rect;
 }
 
 void tst_qdeclarativebehaviors::explicitSelection()
@@ -239,6 +259,8 @@ void tst_qdeclarativebehaviors::explicitSelection()
         QTest::qWait(200);
         qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
         QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
+
+        delete rect;
     }
 }
 
@@ -253,6 +275,8 @@ void tst_qdeclarativebehaviors::nonSelectingBehavior()
         rect->setState("moved");
         qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
         QCOMPARE(x, qreal(200));    //should change immediately
+
+        delete rect;
     }
 }
 
@@ -266,6 +290,8 @@ void tst_qdeclarativebehaviors::reassignedAnimation()
     QCOMPARE(qobject_cast<QDeclarativeNumberAnimation*>(
                  qobject_cast<QDeclarativeBehavior*>(
                      rect->findChild<QDeclarativeBehavior*>("MyBehavior"))->animation())->duration(), 200);
+
+    delete rect;
 }
 
 void tst_qdeclarativebehaviors::disabled()
@@ -279,6 +305,8 @@ void tst_qdeclarativebehaviors::disabled()
     rect->setState("moved");
     qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
     QCOMPARE(x, qreal(200));    //should change immediately
+
+    delete rect;
 }
 
 void tst_qdeclarativebehaviors::dontStart()
@@ -294,6 +322,8 @@ void tst_qdeclarativebehaviors::dontStart()
     QDeclarativeAbstractAnimation *myAnim = rect->findChild<QDeclarativeAbstractAnimation*>("MyAnim");
     QVERIFY(myAnim && myAnim->qtAnimation());
     QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimation::Stopped);
+
+    delete rect;
 }
 
 QTEST_MAIN(tst_qdeclarativebehaviors)
diff --git a/tests/auto/declarative/qdeclarativebinding/data/test-binding.qml b/tests/auto/declarative/qdeclarativebinding/data/test-binding.qml
index e9101e4..8f5b39e 100644
--- a/tests/auto/declarative/qdeclarativebinding/data/test-binding.qml
+++ b/tests/auto/declarative/qdeclarativebinding/data/test-binding.qml
@@ -12,5 +12,5 @@ Rectangle {
 
     Binding { target: screen; property: "text"; value: s1.text; objectName: "binding1" }
     Binding { target: screen; property: "color"; value: r1.color }
-    Binding { target: screen; property: "color"; when: screen.changeColor == true; value: r2.color }
+    Binding { target: screen; property: "color"; when: screen.changeColor == true; value: r2.color; objectName: "binding3" }
 }
diff --git a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
index 483d588..8ab7b0b 100644
--- a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
+++ b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
@@ -69,14 +69,20 @@ void tst_qdeclarativebinding::binding()
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-binding.qml"));
     QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
-
     QVERIFY(rect != 0);
+
+    QDeclarativeBind *binding3 = qobject_cast<QDeclarativeBind*>(rect->findChild<QDeclarativeBind*>("binding3"));
+    QVERIFY(binding3 != 0);
+
     QCOMPARE(rect->color(), QColor("yellow"));
     QCOMPARE(rect->property("text").toString(), QString("Hello"));
+    QCOMPARE(binding3->when(), false);
 
     rect->setProperty("changeColor", true);
     QCOMPARE(rect->color(), QColor("red"));
 
+    QCOMPARE(binding3->when(), true);
+
     QDeclarativeBind *binding = qobject_cast<QDeclarativeBind*>(rect->findChild<QDeclarativeBind*>("binding1"));
     QVERIFY(binding != 0);
     QCOMPARE(binding->object(), qobject_cast<QObject*>(rect));
diff --git a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
index adea384..79b0c36 100644
--- a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
+++ b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
@@ -340,6 +340,7 @@ void tst_qdeclarativedom::loadImports()
                      "Item {}";
 
     QDeclarativeEngine engine;
+    engine.addImportPath(SRCDIR "/data");
     QDeclarativeDomDocument document;
     QVERIFY(document.load(&engine, qml, QUrl::fromLocalFile(SRCDIR "/data/dummy.qml")));
 
@@ -450,8 +451,7 @@ void tst_qdeclarativedom::loadDynamicProperty()
                          "    property color g\n"
                          "    property date h\n"
                          "    property var i\n"
-                         "    property variant j\n"
-                         "    property QtObject k\n"
+                         "    property QtObject j\n"
                          "}";
 
         QDeclarativeDomDocument document;
@@ -460,7 +460,7 @@ void tst_qdeclarativedom::loadDynamicProperty()
         QDeclarativeDomObject rootObject = document.rootObject();
         QVERIFY(rootObject.isValid());
 
-        QCOMPARE(rootObject.dynamicProperties().count(), 11);
+        QCOMPARE(rootObject.dynamicProperties().count(), 10);
 
 #define DP_TEST(index, name, type, test_position, test_length, propTypeName) \
     { \
@@ -482,10 +482,9 @@ void tst_qdeclarativedom::loadDynamicProperty()
         DP_TEST(4, e, QVariant::String, 106, 17, "string");
         DP_TEST(5, f, QVariant::Url, 128, 14, "url");
         DP_TEST(6, g, QVariant::Color, 147, 16, "color");
-        DP_TEST(7, h, QVariant::Date, 168, 15, "date");
+        DP_TEST(7, h, QVariant::DateTime, 168, 15, "date");
         DP_TEST(8, i, qMetaTypeId<QVariant>(), 188, 14, "var");
-        DP_TEST(9, j, qMetaTypeId<QVariant>(), 207, 18, "variant");
-        DP_TEST(10, k, -1, 230, 19, "QtObject");
+        DP_TEST(9, j, -1, 207, 19, "QtObject");
     }
 
     {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/regExp.qml b/tests/auto/declarative/qdeclarativeecmascript/data/regExp.qml
new file mode 100644
index 0000000..0dc404b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/regExp.qml
@@ -0,0 +1,7 @@
+import Qt.test 1.0
+
+MyQmlObject{
+    id: obj
+    objectName: "obj"
+    regExp: /[a-zA-z]/
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
index 72dc3bb..faad8b7 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
+++ b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
@@ -90,6 +90,7 @@ class MyQmlObject : public QObject
     Q_PROPERTY(QObject *objectProperty READ objectProperty WRITE setObjectProperty NOTIFY objectChanged)
     Q_PROPERTY(QDeclarativeListProperty<QObject> objectListProperty READ objectListProperty CONSTANT)
     Q_PROPERTY(int resettableProperty READ resettableProperty WRITE setResettableProperty RESET resetProperty)
+    Q_PROPERTY(QRegExp regExp READ regExp WRITE setRegExp)
 
 public:
     MyQmlObject(): m_methodCalled(false), m_methodIntCalled(false), m_object(0), m_value(0), m_resetProperty(13) {}
@@ -138,6 +139,9 @@ public:
     void setResettableProperty(int v) { m_resetProperty = v; }
     void resetProperty() { m_resetProperty = 13; }
 
+    QRegExp regExp() { return m_regExp; }
+    void setRegExp(const QRegExp &regExp) { m_regExp = regExp; }
+
 signals:
     void basicSignal();
     void argumentSignal(int a, QString b, qreal c);
@@ -162,6 +166,7 @@ private:
     QList<QObject *> m_objectQList;
     int m_value;
     int m_resetProperty;
+    QRegExp m_regExp;
 };
 
 QML_DECLARE_TYPEINFO(MyQmlObject, QML_HAS_ATTACHED_PROPERTIES)
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 87d73a0..2791722c 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -131,6 +131,7 @@ private slots:
 
     void bug1();
     void dynamicCreationCrash();
+    void regExpBug();
 
     void callQtInvokables();
 private:
@@ -1241,6 +1242,15 @@ void tst_qdeclarativeecmascript::dynamicCreationCrash()
     QVERIFY(created == 0);
 }
 
+//QTBUG-9367
+void tst_qdeclarativeecmascript::regExpBug()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("regExp.qml"));
+    MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
+    QVERIFY(object != 0);
+    QCOMPARE(object->regExp().pattern(), QLatin1String("[a-zA-z]"));
+}
+
 void tst_qdeclarativeecmascript::callQtInvokables()
 {
     MyInvokableObject o;
diff --git a/tests/auto/declarative/qdeclarativeimage/data/big.jpeg b/tests/auto/declarative/qdeclarativeimage/data/big.jpeg
new file mode 100644
index 0000000..bed7bd6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeimage/data/big.jpeg
diff --git a/tests/auto/declarative/qdeclarativeimage/data/big256.png b/tests/auto/declarative/qdeclarativeimage/data/big256.png
new file mode 100644
index 0000000..1dc1596
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeimage/data/big256.png
diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart-mac.png b/tests/auto/declarative/qdeclarativeimage/data/heart-mac.png
new file mode 100644
index 0000000..d7df0e4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeimage/data/heart-mac.png
diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart-win32.png b/tests/auto/declarative/qdeclarativeimage/data/heart-win32.png
new file mode 100644
index 0000000..351da13
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeimage/data/heart-win32.png
diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart.png b/tests/auto/declarative/qdeclarativeimage/data/heart.png
new file mode 100644
index 0000000..372b224
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeimage/data/heart.png
diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart.svg b/tests/auto/declarative/qdeclarativeimage/data/heart.svg
new file mode 100644
index 0000000..8c982cd
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeimage/data/heart.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) --><svg viewBox="100 200 550 500" height="841.88976pt" id="svg1" inkscape:version="0.40+cvs" sodipodi:docbase="C:\Documents and Settings\Jon Phillips\My Documents\projects\clipart-project\submissions" sodipodi:docname="heart-left-highlight.svg" sodipodi:version="0.32" width="595.27559pt" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg">
+<metadata>
+<rdf:RDF xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+<cc:Work rdf:about="">
+<dc:title>Heart Left-Highlight</dc:title>
+<dc:description>This is a normal valentines day heart.</dc:description>
+<dc:subject>
+<rdf:Bag>
+<rdf:li>holiday</rdf:li>
+<rdf:li>valentines</rdf:li>
+<rdf:li></rdf:li>
+<rdf:li>valentine</rdf:li>
+<rdf:li>hash(0x8a091c0)</rdf:li>
+<rdf:li>hash(0x8a0916c)</rdf:li>
+<rdf:li>signs_and_symbols</rdf:li>
+<rdf:li>hash(0x8a091f0)</rdf:li>
+<rdf:li>day</rdf:li>
+</rdf:Bag>
+</dc:subject>
+<dc:publisher>
+<cc:Agent rdf:about="http://www.openclipart.org">
+<dc:title>Jon Phillips</dc:title>
+</cc:Agent>
+</dc:publisher>
+<dc:creator>
+<cc:Agent>
+<dc:title>Jon Phillips</dc:title>
+</cc:Agent>
+</dc:creator>
+<dc:rights>
+<cc:Agent>
+<dc:title>Jon Phillips</dc:title>
+</cc:Agent>
+</dc:rights>
+<dc:date></dc:date>
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<cc:license rdf:resource="http://web.resource.org/cc/PublicDomain"/>
+<dc:language>en</dc:language>
+</cc:Work>
+<cc:License rdf:about="http://web.resource.org/cc/PublicDomain">
+<cc:permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
+<cc:permits rdf:resource="http://web.resource.org/cc/Distribution"/>
+<cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks"/>
+</cc:License>
+</rdf:RDF>
+</metadata>
+<defs id="defs3"/>
+<sodipodi:namedview bordercolor="#666666" borderopacity="1.0" id="base" inkscape:current-layer="layer1" inkscape:cx="549.40674" inkscape:cy="596.00159" inkscape:document-units="px" inkscape:guide-bbox="true" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="615" inkscape:window-width="866" inkscape:window-x="88" inkscape:window-y="116" inkscape:zoom="0.35000000" pagecolor="#ffffff" showguides="true"/>
+<g id="layer1" inkscape:groupmode="layer" inkscape:label="Layer 1">
+<path d="M 263.41570,235.14588 C 197.17570,235.14588 143.41575,288.90587 143.41575,355.14588 C 143.41575,489.90139 279.34890,525.23318 371.97820,658.45392 C 459.55244,526.05056 600.54070,485.59932 600.54070,355.14588 C 600.54070,288.90588 546.78080,235.14587 480.54070,235.14588 C 432.49280,235.14588 391.13910,263.51631 371.97820,304.33338 C 352.81740,263.51630 311.46370,235.14587 263.41570,235.14588 z " id="path7" sodipodi:nodetypes="ccccccc" style="fill:#e60000;fill-opacity:1.0000000;stroke:#000000;stroke-width:18.700001;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"/>
+<path d="M 265.00000,253.59375 C 207.04033,253.59375 160.00000,300.63407 160.00000,358.59375 C 160.00000,476.50415 278.91857,507.43251 359.96875,624.00000 C 366.52868,614.08205 220.00000,478.47309 220.00000,378.59375 C 220.00000,320.63407 267.04033,273.59375 325.00000,273.59375 C 325.50453,273.59375 325.99718,273.64912 326.50000,273.65625 C 309.22436,261.07286 288.00557,253.59374 265.00000,253.59375 z " id="path220" sodipodi:nodetypes="ccccccc" style="fill:#e6e6e6;fill-opacity:0.64556962;stroke:none;stroke-width:18.700001;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"/>
+</g>
+</svg>
diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart200-mac.png b/tests/auto/declarative/qdeclarativeimage/data/heart200-mac.png
new file mode 100644
index 0000000..df22325
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeimage/data/heart200-mac.png
diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart200-win32.png b/tests/auto/declarative/qdeclarativeimage/data/heart200-win32.png
new file mode 100644
index 0000000..4976ff9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeimage/data/heart200-win32.png
diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart200.png b/tests/auto/declarative/qdeclarativeimage/data/heart200.png
new file mode 100644
index 0000000..786e75d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeimage/data/heart200.png
diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
index ed2095b..ec9f4ec 100644
--- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
+++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
@@ -82,6 +82,8 @@ private slots:
     void resized();
     void smooth();
     void pixmap();
+    void svg();
+    void big();
 
 private:
     QDeclarativeEngine engine;
@@ -111,24 +113,29 @@ void tst_qdeclarativeimage::noSource()
 void tst_qdeclarativeimage::imageSource_data()
 {
     QTest::addColumn<QString>("source");
+    QTest::addColumn<qreal>("width");
+    QTest::addColumn<qreal>("height");
     QTest::addColumn<bool>("remote");
     QTest::addColumn<bool>("async");
     QTest::addColumn<QString>("error");
 
-    QTest::newRow("local") << QUrl::fromLocalFile(SRCDIR "/data/colors.png").toString() << false << false << "";
-    QTest::newRow("local async") << QUrl::fromLocalFile(SRCDIR "/data/colors1.png").toString() << false << true << "";
-    QTest::newRow("local not found") << QUrl::fromLocalFile(SRCDIR "/data/no-such-file.png").toString() << false
+    QTest::newRow("local") << QUrl::fromLocalFile(SRCDIR "/data/colors.png").toString() << 120.0 << 120.0 << false << false << "";
+    QTest::newRow("local async") << QUrl::fromLocalFile(SRCDIR "/data/colors1.png").toString() << 120.0 << 120.0 << false << true << "";
+    QTest::newRow("local not found") << QUrl::fromLocalFile(SRCDIR "/data/no-such-file.png").toString() << 0.0 << 0.0 << false
         << false << "Cannot open  QUrl( \"" + QUrl::fromLocalFile(SRCDIR "/data/no-such-file.png").toString() + "\" )  ";
-    QTest::newRow("local async not found") << QUrl::fromLocalFile(SRCDIR "/data/no-such-file-1.png").toString() << false
+    QTest::newRow("local async not found") << QUrl::fromLocalFile(SRCDIR "/data/no-such-file-1.png").toString() << 0.0 << 0.0 << false
         << true << "\"Cannot open: " + QUrl::fromLocalFile(SRCDIR "/data/no-such-file-1.png").toString() + "\" ";
-    QTest::newRow("remote") << SERVER_ADDR "/colors.png" << true << false << "";
-    QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.png" << true << false
+    QTest::newRow("remote") << SERVER_ADDR "/colors.png" << 120.0 << 120.0 << true << false << "";
+    QTest::newRow("remote svg") << SERVER_ADDR "/heart.svg" << 550.0 << 500.0 << true << false << "";
+    QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.png" << 0.0 << 0.0 << true << false
         << "\"Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found\" ";
 }
 
 void tst_qdeclarativeimage::imageSource()
 {
     QFETCH(QString, source);
+    QFETCH(qreal, width);
+    QFETCH(qreal, height);
     QFETCH(bool, remote);
     QFETCH(bool, async);
     QFETCH(QString, error);
@@ -148,6 +155,9 @@ void tst_qdeclarativeimage::imageSource()
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
     QVERIFY(obj != 0);
+
+    if (async)
+        QVERIFY(obj->asynchronous() == true);
     
     if (remote || async)
         TRY_WAIT(obj->status() == QDeclarativeImage::Loading);
@@ -156,8 +166,8 @@ void tst_qdeclarativeimage::imageSource()
 
     if (error.isEmpty()) {
         TRY_WAIT(obj->status() == QDeclarativeImage::Ready);
-        QCOMPARE(obj->width(), 120.);
-        QCOMPARE(obj->height(), 120.);
+        QCOMPARE(obj->width(), width);
+        QCOMPARE(obj->height(), height);
         QCOMPARE(obj->fillMode(), QDeclarativeImage::Stretch);
         QCOMPARE(obj->progress(), 1.0);
     } else {
@@ -248,6 +258,64 @@ void tst_qdeclarativeimage::pixmap()
     delete obj;
 }
 
+void tst_qdeclarativeimage::svg()
+{
+    QString src = QUrl::fromLocalFile(SRCDIR "/data/heart.svg").toString();
+    QString componentStr = "import Qt 4.6\nImage { source: \"" + src + "\"; sourceSize.width: 300; sourceSize.height: 300 }";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
+    QVERIFY(obj != 0);
+    QCOMPARE(obj->pixmap().width(), 300);
+    QCOMPARE(obj->pixmap().height(), 300);
+    QCOMPARE(obj->width(), 550.0);
+    QCOMPARE(obj->height(), 500.0);
+#if defined(Q_OS_MAC)
+    QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart-mac.png"));
+#elif defined(Q_OS_WIN32)
+    QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart-win32.png"));
+#else
+    QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart.png"));
+#endif
+
+    obj->setSourceSize(QSize(200,200));
+
+    QCOMPARE(obj->pixmap().width(), 200);
+    QCOMPARE(obj->pixmap().height(), 200);
+    QCOMPARE(obj->width(), 550.0);
+    QCOMPARE(obj->height(), 500.0);
+#if defined(Q_OS_MAC)
+    QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart200-mac.png"));
+#elif defined(Q_OS_WIN32)
+    QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart200-win32.png"));
+#else
+    QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart200.png"));
+#endif
+    delete obj;
+}
+
+void tst_qdeclarativeimage::big()
+{
+    // If the JPEG loader does not implement scaling efficiently, it would
+    // have to build a 400 MB image. That would be a bug in the JPEG loader.
+
+    QString src = QUrl::fromLocalFile(SRCDIR "/data/big.jpeg").toString();
+    QString componentStr = "import Qt 4.6\nImage { source: \"" + src + "\"; sourceSize.width: 256; sourceSize.height: 256 }";
+
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
+    QVERIFY(obj != 0);
+    QCOMPARE(obj->pixmap().width(), 256);
+    QCOMPARE(obj->pixmap().height(), 256);
+    QCOMPARE(obj->width(), 10240.0);
+    QCOMPARE(obj->height(), 10240.0);
+    QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/big256.png"));
+
+    delete obj;
+}
+
+
 QTEST_MAIN(tst_qdeclarativeimage)
 
 #include "tst_qdeclarativeimage.moc"
diff --git a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
index c5bdfc8..fe5f5a2 100644
--- a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
+++ b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
@@ -43,6 +43,7 @@
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativeimageprovider.h>
 #include <private/qdeclarativeimage_p.h>
+#include <QImageReader>
 
 // QDeclarativeImageProvider::request() is run in an idle thread where possible
 // Be generous in our timeout.
@@ -76,28 +77,35 @@ private:
 class TestProvider : public QDeclarativeImageProvider
 {
 public:
-    QImage request(const QString &id) {
-        QImage image;
-        image.load(SRCDIR "/data/" + id);
-        return image;
+    QImage request(const QString &id, QSize *size, const QSize& requested_size) {
+        QImageReader io(SRCDIR "/data/" + id);
+        if (size) *size = io.size();
+        if (requested_size.isValid())
+            io.setScaledSize(requested_size);
+        return io.read();
     }
 };
 
 void tst_qdeclarativeimageprovider::imageSource_data()
 {
     QTest::addColumn<QString>("source");
+    QTest::addColumn<QString>("properties");
+    QTest::addColumn<QSize>("size");
     QTest::addColumn<QString>("error");
 
-    QTest::newRow("exists") << "image://test/exists.png" << "";
-    QTest::newRow("missing") << "image://test/no-such-file.png"
+    QTest::newRow("exists") << "image://test/exists.png" << "" << QSize(100,100) << "";
+    QTest::newRow("scaled") << "image://test/exists.png" << "sourceSize: \"80x30\"" << QSize(80,30) << "";
+    QTest::newRow("missing") << "image://test/no-such-file.png" << "" << QSize()
         << "\"Failed to get image from provider: image://test/no-such-file.png\" ";
-    QTest::newRow("unknown provider") << "image://bogus/exists.png"
+    QTest::newRow("unknown provider") << "image://bogus/exists.png" << "" << QSize()
         << "\"Failed to get image from provider: image://bogus/exists.png\" ";
 }
     
 void tst_qdeclarativeimageprovider::imageSource()
 {
     QFETCH(QString, source);
+    QFETCH(QString, properties);
+    QFETCH(QSize, size);
     QFETCH(QString, error);
 
     if (!error.isEmpty())
@@ -106,7 +114,7 @@ void tst_qdeclarativeimageprovider::imageSource()
     engine.addImageProvider("test", new TestProvider);
     QVERIFY(engine.imageProvider("test") != 0);
 
-    QString componentStr = "import Qt 4.6\nImage { source: \"" + source + "\" }";
+    QString componentStr = "import Qt 4.6\nImage { source: \"" + source + "\"; " + properties + " }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
@@ -118,8 +126,10 @@ void tst_qdeclarativeimageprovider::imageSource()
 
     if (error.isEmpty()) {
         TRY_WAIT(obj->status() == QDeclarativeImage::Ready);
-        QCOMPARE(obj->width(), 100.);
-        QCOMPARE(obj->height(), 100.);
+        QCOMPARE(obj->width(), 100.0);
+        QCOMPARE(obj->height(), 100.0);
+        QCOMPARE(obj->pixmap().width(), size.width());
+        QCOMPARE(obj->pixmap().height(), size.height());
         QCOMPARE(obj->fillMode(), QDeclarativeImage::Stretch);
         QCOMPARE(obj->progress(), 1.0);
     } else {
diff --git a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
index ba69cd8..46f3517 100644
--- a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
+++ b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
@@ -61,6 +61,8 @@ private slots:
     void mapCoordinates();
     void mapCoordinates_data();
     void propertyChanges();
+    void transforms();
+    void transforms_data();
 
 private:
     template<typename T>
@@ -402,6 +404,31 @@ void tst_QDeclarativeItem::mapCoordinates_data()
         QTest::newRow(QTest::toString(i)) << i << i;
 }
 
+void tst_QDeclarativeItem::transforms_data()
+{
+    QTest::addColumn<QByteArray>("qml");
+    QTest::addColumn<QMatrix>("matrix");
+    QTest::newRow("translate") << QByteArray("Translate { x: 10; y: 20 }")
+        << QMatrix(1,0,0,1,10,20);
+    QTest::newRow("rotation") << QByteArray("Rotation { angle: 90 }")
+        << QMatrix(0,1,-1,0,0,0);
+    QTest::newRow("scale") << QByteArray("Scale { xScale: 1.5; yScale: -2  }")
+        << QMatrix(1.5,0,0,-2,0,0);
+    QTest::newRow("sequence") << QByteArray("[ Translate { x: 10; y: 20 }, Scale { xScale: 1.5; yScale: -2  } ]")
+        << QMatrix(1,0,0,1,10,20) * QMatrix(1.5,0,0,-2,0,0);
+}
+
+void tst_QDeclarativeItem::transforms()
+{
+    QFETCH(QByteArray, qml);
+    QFETCH(QMatrix, matrix);
+    QDeclarativeComponent component(&engine);
+    component.setData("import Qt 4.6\nItem { transform: "+qml+"}", QUrl::fromLocalFile(""));
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
+    QVERIFY(item);
+    QCOMPARE(item->sceneMatrix(), matrix);
+}
+
 void tst_QDeclarativeItem::propertyChanges()
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
@@ -421,8 +448,8 @@ void tst_QDeclarativeItem::propertyChanges()
     QVERIFY(parentItem);
 
     QSignalSpy parentSpy(item, SIGNAL(parentChanged(QDeclarativeItem *)));
-    QSignalSpy widthSpy(item, SIGNAL(widthChanged(qreal)));
-    QSignalSpy heightSpy(item, SIGNAL(heightChanged(qreal)));
+    QSignalSpy widthSpy(item, SIGNAL(widthChanged()));
+    QSignalSpy heightSpy(item, SIGNAL(heightChanged()));
     QSignalSpy baselineOffsetSpy(item, SIGNAL(baselineOffsetChanged(qreal)));
     QSignalSpy childrenRectSpy(parentItem, SIGNAL(childrenRectChanged(QRectF)));
     QSignalSpy focusSpy(item, SIGNAL(focusChanged(bool)));
@@ -442,15 +469,9 @@ void tst_QDeclarativeItem::propertyChanges()
 
     QCOMPARE(item->width(), 100.0);
     QCOMPARE(widthSpy.count(),1);
-    QList<QVariant> widthArguments = widthSpy.first();
-    QVERIFY(widthArguments.count() == 1);
-    QCOMPARE(item->width(), widthArguments.at(0).toReal());
 
     QCOMPARE(item->height(), 200.0);
     QCOMPARE(heightSpy.count(),1);
-    QList<QVariant> heightArguments = heightSpy.first();
-    QVERIFY(heightArguments.count() == 1);
-    QCOMPARE(item->height(), heightArguments.at(0).toReal());
 
     QCOMPARE(item->baselineOffset(), 10.0);
     QCOMPARE(baselineOffsetSpy.count(),1);
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml
index aef3269..bedab8c 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml
@@ -10,5 +10,4 @@ QtObject {
     property url urlProperty: "main.qml"
     property date dateProperty: "1945-09-02"
     property var varProperty: "Hello World!"
-    property variant variantProperty: 12
 }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml
index d8a22a8..38cf6bb 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml
@@ -1,2 +1,2 @@
-import Qt 4.6
-Rectangle {}
+import Qt 4.6 as Qt
+Qt.Rectangle {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index eae78c4..e2cf5ca 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -586,7 +586,6 @@ void tst_qdeclarativelanguage::dynamicProperties()
     QCOMPARE(object->property("colorProperty"), QVariant(QColor("red")));
     QCOMPARE(object->property("dateProperty"), QVariant(QDate(1945, 9, 2)));
     QCOMPARE(object->property("varProperty"), QVariant("Hello World!"));
-    QCOMPARE(object->property("variantProperty"), QVariant(12));
 }
 
 // Test that nested types can use dynamic properties
diff --git a/tests/auto/declarative/qdeclarativelistview/data/listviewtest.qml b/tests/auto/declarative/qdeclarativelistview/data/listviewtest.qml
index 1c1b3f8..cc64c3f 100644
--- a/tests/auto/declarative/qdeclarativelistview/data/listviewtest.qml
+++ b/tests/auto/declarative/qdeclarativelistview/data/listviewtest.qml
@@ -85,12 +85,10 @@ Rectangle {
                 }
                 color: ListView.isCurrentItem ? "lightsteelblue" : "white"
                 ListView.onRemove: SequentialAnimation {
-                    ScriptAction { script: console.log("Fix PropertyAction with attached properties") }
-/*
                     PropertyAction { target: wrapper; property: "ListView.delayRemove"; value: true }
                     NumberAnimation { target: wrapper; property: "scale"; to: 0; duration: 250; easing.type: "InOutQuad" }
                     PropertyAction { target: wrapper; property: "ListView.delayRemove"; value: false }
-*/
+
                 }
             }
         },
diff --git a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
index a745a24..05d968c 100644
--- a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
+++ b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
@@ -129,6 +129,10 @@ void tst_QDeclarativeLoader::component()
     QCOMPARE(loader->status(), QDeclarativeLoader::Ready);
     QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
 
+    QDeclarativeComponent *c = qobject_cast<QDeclarativeComponent*>(item->QGraphicsObject::children().at(0));
+    QVERIFY(c);
+    QCOMPARE(loader->sourceComponent(), c);
+
     delete loader;
 }
 
diff --git a/tests/auto/declarative/qdeclarativepathview/data/displaypath.qml b/tests/auto/declarative/qdeclarativepathview/data/displaypath.qml
index ab1538b..eded122 100644
--- a/tests/auto/declarative/qdeclarativepathview/data/displaypath.qml
+++ b/tests/auto/declarative/qdeclarativepathview/data/displaypath.qml
@@ -33,7 +33,6 @@ Rectangle {
         height: 320
         model: testModel
         delegate: delegate
-        snapPosition: 0.0001
         path: Path {
             startY: 120
             startX: 160
diff --git a/tests/auto/declarative/qdeclarativepathview/data/pathview0.qml b/tests/auto/declarative/qdeclarativepathview/data/pathview0.qml
index ae0c86a..1866875 100644
--- a/tests/auto/declarative/qdeclarativepathview/data/pathview0.qml
+++ b/tests/auto/declarative/qdeclarativepathview/data/pathview0.qml
@@ -48,7 +48,11 @@ Rectangle {
         height: 320
         model: testModel
         delegate: delegate
-        snapPosition: 0.0001
+        highlight: Rectangle {
+            width: 60
+            height: 20
+            color: "yellow"
+        }
         path: Path {
             startY: 120
             startX: 160
diff --git a/tests/auto/declarative/qdeclarativepathview/data/pathview3.qml b/tests/auto/declarative/qdeclarativepathview/data/pathview3.qml
index 70cfbcd..b143294 100644
--- a/tests/auto/declarative/qdeclarativepathview/data/pathview3.qml
+++ b/tests/auto/declarative/qdeclarativepathview/data/pathview3.qml
@@ -2,8 +2,10 @@ import Qt 4.6
 
 PathView {
     id: photoPathView
-    y: 100; width: 800; height: 330; pathItemCount: 4; offset: 0.1
-    dragMargin: 24; snapPosition: 0.50
+    y: 100; width: 800; height: 330; pathItemCount: 4; offset: 1
+    dragMargin: 24
+    preferredHighlightBegin: 0.50
+    preferredHighlightEnd: 0.50
 
     path: Path {
         startX: -50; startY: 40;
diff --git a/tests/auto/declarative/qdeclarativepathview/data/propertychanges.qml b/tests/auto/declarative/qdeclarativepathview/data/propertychanges.qml
index db70b7b..1ae1ad2 100644
--- a/tests/auto/declarative/qdeclarativepathview/data/propertychanges.qml
+++ b/tests/auto/declarative/qdeclarativepathview/data/propertychanges.qml
@@ -17,7 +17,8 @@ Rectangle {
     }
 
     PathView {
-        snapPosition: 0.1
+        preferredHighlightBegin: 0.1
+        preferredHighlightEnd: 0.1
         dragMargin: 5.0
         id: pathView
         objectName: "pathView"
diff --git a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
index c16c46f..4d43c68 100644
--- a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
+++ b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
@@ -194,7 +194,7 @@ void tst_QDeclarativePathView::initValues()
     QCOMPARE(obj->model(), QVariant());
     QCOMPARE(obj->currentIndex(), 0);
     QCOMPARE(obj->offset(), 0.);
-    QCOMPARE(obj->snapPosition(), 0.);
+    QCOMPARE(obj->preferredHighlightBegin(), 0.);
     QCOMPARE(obj->dragMargin(), 0.);
     QCOMPARE(obj->count(), 0);
     QCOMPARE(obj->pathItemCount(), -1);
@@ -219,7 +219,7 @@ void tst_QDeclarativePathView::items()
     QDeclarativePathView *pathview = findItem<QDeclarativePathView>(canvas->rootObject(), "view");
     QVERIFY(pathview != 0);
 
-    QCOMPARE(pathview->childItems().count(), model.count()); // assumes all are visible
+    QCOMPARE(pathview->childItems().count(), model.count()+1); // assumes all are visible, including highlight
 
     for (int i = 0; i < model.count(); ++i) {
         QDeclarativeText *name = findItem<QDeclarativeText>(pathview, "textName", i);
@@ -230,6 +230,16 @@ void tst_QDeclarativePathView::items()
         QCOMPARE(number->text(), model.number(i));
     }
 
+    QDeclarativePath *path = qobject_cast<QDeclarativePath*>(pathview->path());
+    QVERIFY(path);
+
+    QVERIFY(pathview->highlightItem());
+    QPointF start = path->pointAt(0.0);
+    QPointF offset;
+    offset.setX(pathview->highlightItem()->width()/2);
+    offset.setY(pathview->highlightItem()->height()/2);
+    QCOMPARE(pathview->highlightItem()->pos() + offset, start);
+
     delete canvas;
 }
 
@@ -245,7 +255,7 @@ void tst_QDeclarativePathView::pathview2()
     QVERIFY(obj->model() != QVariant());
     QCOMPARE(obj->currentIndex(), 0);
     QCOMPARE(obj->offset(), 0.);
-    QCOMPARE(obj->snapPosition(), 0.);
+    QCOMPARE(obj->preferredHighlightBegin(), 0.);
     QCOMPARE(obj->dragMargin(), 0.);
     QCOMPARE(obj->count(), 8);
     QCOMPARE(obj->pathItemCount(), 10);
@@ -262,8 +272,8 @@ void tst_QDeclarativePathView::pathview3()
     QVERIFY(obj->delegate() != 0);
     QVERIFY(obj->model() != QVariant());
     QCOMPARE(obj->currentIndex(), 0);
-    QCOMPARE(obj->offset(), 0.5); // ???
-    QCOMPARE(obj->snapPosition(), 0.5); // ???
+    QCOMPARE(obj->offset(), 1.0);
+    QCOMPARE(obj->preferredHighlightBegin(), 0.5);
     QCOMPARE(obj->dragMargin(), 24.);
     QCOMPARE(obj->count(), 8);
     QCOMPARE(obj->pathItemCount(), 4);
@@ -422,14 +432,14 @@ void tst_QDeclarativePathView::pathMoved()
     offset.setX(firstItem->width()/2);
     offset.setY(firstItem->height()/2);
     QCOMPARE(firstItem->pos() + offset, start);
-    pathview->setOffset(0.1);
+    pathview->setOffset(1.0);
 
     for(int i=0; i<model.count(); i++){
         QDeclarativeRectangle *curItem = findItem<QDeclarativeRectangle>(pathview, "wrapper", i);
-        QCOMPARE(curItem->pos() + offset, path->pointAt(0.1 + i*0.25));
+        QCOMPARE(curItem->pos() + offset, path->pointAt(0.25 + i*0.25));
     }
 
-    pathview->setOffset(1.0);
+    pathview->setOffset(0.0);
     QCOMPARE(firstItem->pos() + offset, start);
 
     delete canvas;
@@ -524,22 +534,25 @@ void tst_QDeclarativePathView::propertyChanges()
     QDeclarativePathView *pathView = canvas->rootObject()->findChild<QDeclarativePathView*>("pathView");
     QVERIFY(pathView);
 
-    QSignalSpy snapPositionSpy(pathView, SIGNAL(snapPositionChanged()));
+    QSignalSpy snapPositionSpy(pathView, SIGNAL(preferredHighlightBeginChanged()));
     QSignalSpy dragMarginSpy(pathView, SIGNAL(dragMarginChanged()));
 
-    QCOMPARE(pathView->snapPosition(), 0.1);
+    QCOMPARE(pathView->preferredHighlightBegin(), 0.1);
     QCOMPARE(pathView->dragMargin(), 5.0);
 
-    pathView->setSnapPosition(0.4);
+    pathView->setPreferredHighlightBegin(0.4);
+    pathView->setPreferredHighlightEnd(0.4);
     pathView->setDragMargin(20.0);
 
-    QCOMPARE(pathView->snapPosition(), 0.4);
+    QCOMPARE(pathView->preferredHighlightBegin(), 0.4);
+    QCOMPARE(pathView->preferredHighlightEnd(), 0.4);
     QCOMPARE(pathView->dragMargin(), 20.0);
 
     QCOMPARE(snapPositionSpy.count(), 1);
     QCOMPARE(dragMarginSpy.count(), 1);
 
-    pathView->setSnapPosition(0.4);
+    pathView->setPreferredHighlightBegin(0.4);
+    pathView->setPreferredHighlightEnd(0.4);
     pathView->setDragMargin(20.0);
 
     QCOMPARE(snapPositionSpy.count(), 1);
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/flowtest.qml b/tests/auto/declarative/qdeclarativepositioners/data/flowtest.qml
new file mode 100644
index 0000000..bd13bac
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepositioners/data/flowtest.qml
@@ -0,0 +1,39 @@
+import Qt 4.6
+
+Item {
+    width: 90
+    height: 480
+    Flow {
+        anchors.fill: parent
+        Rectangle {
+            objectName: "one"
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "two"
+            color: "green"
+            width: 20
+            height: 50
+        }
+        Rectangle {
+            objectName: "three"
+            color: "blue"
+            width: 50
+            height: 20
+        }
+        Rectangle {
+            objectName: "four"
+            color: "cyan"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "five"
+            color: "magenta"
+            width: 10
+            height: 10
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
index 0e1fee2..9026566 100644
--- a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
+++ b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
@@ -65,6 +65,8 @@ private slots:
     void test_grid_animated();
     void test_propertychanges();
     void test_repeater();
+    void test_flow();
+    void test_flow_resize();
 private:
     QDeclarativeView *createView(const QString &filename);
 };
@@ -441,6 +443,64 @@ void tst_QDeclarativePositioners::test_repeater()
     QCOMPARE(three->y(), 0.0);
 }
 
+void tst_QDeclarativePositioners::test_flow()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/flowtest.qml");
+
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+    QDeclarativeRectangle *four = canvas->rootObject()->findChild<QDeclarativeRectangle*>("four");
+    QVERIFY(four != 0);
+    QDeclarativeRectangle *five = canvas->rootObject()->findChild<QDeclarativeRectangle*>("five");
+    QVERIFY(five != 0);
+
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 50.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 0.0);
+    QCOMPARE(three->y(), 50.0);
+    QCOMPARE(four->x(), 0.0);
+    QCOMPARE(four->y(), 70.0);
+    QCOMPARE(five->x(), 50.0);
+    QCOMPARE(five->y(), 70.0);
+}
+
+void tst_QDeclarativePositioners::test_flow_resize()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/flowtest.qml");
+
+    QDeclarativeItem *root = qobject_cast<QDeclarativeItem*>(canvas->rootObject());
+    QVERIFY(root);
+    root->setWidth(125);
+
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+    QDeclarativeRectangle *four = canvas->rootObject()->findChild<QDeclarativeRectangle*>("four");
+    QVERIFY(four != 0);
+    QDeclarativeRectangle *five = canvas->rootObject()->findChild<QDeclarativeRectangle*>("five");
+    QVERIFY(five != 0);
+
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 50.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 70.0);
+    QCOMPARE(three->y(), 0.0);
+    QCOMPARE(four->x(), 0.0);
+    QCOMPARE(four->y(), 50.0);
+    QCOMPARE(five->x(), 50.0);
+    QCOMPARE(five->y(), 50.0);
+}
+
 QDeclarativeView *tst_QDeclarativePositioners::createView(const QString &filename)
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
diff --git a/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp b/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp
index 22c5581..c996a14 100644
--- a/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp
+++ b/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp
@@ -59,6 +59,8 @@ private slots:
     void clear();
     void changed();
     void count();
+
+    void crashBug();
 };
 
 void tst_QDeclarativePropertyMap::insert()
@@ -123,7 +125,7 @@ void tst_QDeclarativePropertyMap::clear()
 void tst_QDeclarativePropertyMap::changed()
 {
     QDeclarativePropertyMap map;
-    QSignalSpy spy(&map, SIGNAL(valueChanged(const QString&)));
+    QSignalSpy spy(&map, SIGNAL(valueChanged(const QString&, const QVariant&)));
     map.insert(QLatin1String("key1"),100);
     map.insert(QLatin1String("key2"),200);
     QCOMPARE(spy.count(), 0);
@@ -144,7 +146,9 @@ void tst_QDeclarativePropertyMap::changed()
     QCOMPARE(txt->text(), QString('X'));
     QCOMPARE(spy.count(), 1);
     QList<QVariant> arguments = spy.takeFirst();
+    QCOMPARE(arguments.count(), 2);
     QCOMPARE(arguments.at(0).toString(),QLatin1String("key1"));
+    QCOMPARE(arguments.at(1).value<QVariant>(),QVariant("Hello World"));
     QCOMPARE(map.value(QLatin1String("key1")), QVariant("Hello World"));
 }
 
@@ -166,6 +170,20 @@ void tst_QDeclarativePropertyMap::count()
     QCOMPARE(map.size(), map.count());
 }
 
+void tst_QDeclarativePropertyMap::crashBug()
+{
+    QDeclarativePropertyMap map;
+
+    QDeclarativeEngine engine;
+    QDeclarativeContext context(&engine);
+    context.setContextProperty("map", &map);
+
+    QDeclarativeComponent c(&engine);
+    c.setData("import Qt 4.6\nBinding { target: map; property: \"myProp\"; value: 10 + 23 }",QUrl());
+    QObject *obj = c.create(&context);
+    delete obj;
+}
+
 QTEST_MAIN(tst_QDeclarativePropertyMap)
 
 #include "tst_qdeclarativepropertymap.moc"
diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges1.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges1.qml
index 7dce889..5443e54 100644
--- a/tests/auto/declarative/qdeclarativestates/data/anchorChanges1.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges1.qml
@@ -16,8 +16,8 @@ Rectangle {
         AnchorChanges {
             id: ancCh
             target: myRect;
-            reset: "left"
-            right: container.right
+            anchors.left: undefined
+            anchors.right: container.right
         }
     }
 }
diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges2.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges2.qml
index 545345e..56de560 100644
--- a/tests/auto/declarative/qdeclarativestates/data/anchorChanges2.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges2.qml
@@ -14,8 +14,8 @@ Rectangle {
         name: "right"
         AnchorChanges {
             target: myRect;
-            reset: "left"
-            right: parent.right
+            anchors.left: undefined
+            anchors.right: parent.right
         }
     }
 }
diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges3.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges3.qml
index 9d5b317..59c3c06 100644
--- a/tests/auto/declarative/qdeclarativestates/data/anchorChanges3.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges3.qml
@@ -20,10 +20,10 @@ Rectangle {
         name: "reanchored"
         AnchorChanges {
             target: myRect;
-            left: leftGuideline.left
-            right: container.right
-            top: container.top
-            bottom: bottomGuideline.bottom
+            anchors.left: leftGuideline.left
+            anchors.right: container.right
+            anchors.top: container.top
+            anchors.bottom: bottomGuideline.bottom
         }
     }
 }
diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges4.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges4.qml
index f128989..7e3ba1c 100644
--- a/tests/auto/declarative/qdeclarativestates/data/anchorChanges4.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges4.qml
@@ -15,8 +15,8 @@ Rectangle {
         name: "reanchored"
         AnchorChanges {
             target: myRect;
-            horizontalCenter: bottomGuideline.horizontalCenter
-            verticalCenter: leftGuideline.verticalCenter
+            anchors.horizontalCenter: bottomGuideline.horizontalCenter
+            anchors.verticalCenter: leftGuideline.verticalCenter
         }
     }
 }
diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges5.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges5.qml
index 4e6d34b..b85a922 100644
--- a/tests/auto/declarative/qdeclarativestates/data/anchorChanges5.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges5.qml
@@ -15,8 +15,8 @@ Rectangle {
         name: "reanchored"
         AnchorChanges {
             target: myRect;
-            horizontalCenter: bottomGuideline.horizontalCenter
-            baseline: leftGuideline.baseline
+            anchors.horizontalCenter: bottomGuideline.horizontalCenter
+            anchors.baseline: leftGuideline.baseline
         }
     }
 }
diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
index 91883c9..2ab21a4 100644
--- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
+++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
@@ -564,10 +564,10 @@ void tst_qdeclarativestates::anchorChanges()
 
     rect->setState("right");
     QCOMPARE(innerRect->x(), qreal(150));
-    QCOMPARE(aChanges->reset(), QString("left"));
+    QCOMPARE(aChanges->anchors()->left().anchorLine, QDeclarativeAnchorLine::Invalid);  //### was reset (how do we distinguish from not set at all)
     QCOMPARE(aChanges->object(), qobject_cast<QDeclarativeItem*>(innerRect));
-    QCOMPARE(aChanges->right().item, rect->right().item);
-    QCOMPARE(aChanges->right().anchorLine, rect->right().anchorLine);
+    QCOMPARE(aChanges->anchors()->right().item, rect->right().item);
+    QCOMPARE(aChanges->anchors()->right().anchorLine, rect->right().anchorLine);
 
     rect->setState("");
     QCOMPARE(innerRect->x(), qreal(5));
@@ -623,14 +623,14 @@ void tst_qdeclarativestates::anchorChanges3()
 
     rect->setState("reanchored");
     QCOMPARE(aChanges->object(), qobject_cast<QDeclarativeItem*>(innerRect));
-    QCOMPARE(aChanges->left().item, leftGuideline->left().item);
-    QCOMPARE(aChanges->left().anchorLine, leftGuideline->left().anchorLine);
-    QCOMPARE(aChanges->right().item, rect->right().item);
-    QCOMPARE(aChanges->right().anchorLine, rect->right().anchorLine);
-    QCOMPARE(aChanges->top().item, rect->top().item);
-    QCOMPARE(aChanges->top().anchorLine, rect->top().anchorLine);
-    QCOMPARE(aChanges->bottom().item, bottomGuideline->bottom().item);
-    QCOMPARE(aChanges->bottom().anchorLine, bottomGuideline->bottom().anchorLine);
+    QCOMPARE(aChanges->anchors()->left().item, leftGuideline->left().item);
+    QCOMPARE(aChanges->anchors()->left().anchorLine, leftGuideline->left().anchorLine);
+    QCOMPARE(aChanges->anchors()->right().item, rect->right().item);
+    QCOMPARE(aChanges->anchors()->right().anchorLine, rect->right().anchorLine);
+    QCOMPARE(aChanges->anchors()->top().item, rect->top().item);
+    QCOMPARE(aChanges->anchors()->top().anchorLine, rect->top().anchorLine);
+    QCOMPARE(aChanges->anchors()->bottom().item, bottomGuideline->bottom().item);
+    QCOMPARE(aChanges->anchors()->bottom().anchorLine, bottomGuideline->bottom().anchorLine);
 
     QCOMPARE(innerRect->x(), qreal(10));
     QCOMPARE(innerRect->y(), qreal(0));
@@ -673,10 +673,10 @@ void tst_qdeclarativestates::anchorChanges4()
 
     rect->setState("reanchored");
     QCOMPARE(aChanges->object(), qobject_cast<QDeclarativeItem*>(innerRect));
-    QCOMPARE(aChanges->horizontalCenter().item, bottomGuideline->horizontalCenter().item);
-    QCOMPARE(aChanges->horizontalCenter().anchorLine, bottomGuideline->horizontalCenter().anchorLine);
-    QCOMPARE(aChanges->verticalCenter().item, leftGuideline->verticalCenter().item);
-    QCOMPARE(aChanges->verticalCenter().anchorLine, leftGuideline->verticalCenter().anchorLine);
+    QCOMPARE(aChanges->anchors()->horizontalCenter().item, bottomGuideline->horizontalCenter().item);
+    QCOMPARE(aChanges->anchors()->horizontalCenter().anchorLine, bottomGuideline->horizontalCenter().anchorLine);
+    QCOMPARE(aChanges->anchors()->verticalCenter().item, leftGuideline->verticalCenter().item);
+    QCOMPARE(aChanges->anchors()->verticalCenter().anchorLine, leftGuideline->verticalCenter().anchorLine);
 
     delete rect;
 }
@@ -708,10 +708,10 @@ void tst_qdeclarativestates::anchorChanges5()
 
     rect->setState("reanchored");
     QCOMPARE(aChanges->object(), qobject_cast<QDeclarativeItem*>(innerRect));
-    QCOMPARE(aChanges->horizontalCenter().item, bottomGuideline->horizontalCenter().item);
-    QCOMPARE(aChanges->horizontalCenter().anchorLine, bottomGuideline->horizontalCenter().anchorLine);
-    QCOMPARE(aChanges->baseline().item, leftGuideline->baseline().item);
-    QCOMPARE(aChanges->baseline().anchorLine, leftGuideline->baseline().anchorLine);
+    QCOMPARE(aChanges->anchors()->horizontalCenter().item, bottomGuideline->horizontalCenter().item);
+    QCOMPARE(aChanges->anchors()->horizontalCenter().anchorLine, bottomGuideline->horizontalCenter().anchorLine);
+    QCOMPARE(aChanges->anchors()->baseline().item, leftGuideline->baseline().item);
+    QCOMPARE(aChanges->anchors()->baseline().anchorLine, leftGuideline->baseline().anchorLine);
 
     delete rect;
 }
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/validators.qml b/tests/auto/declarative/qdeclarativetextinput/data/validators.qml
index 0c81548..531a232 100644
--- a/tests/auto/declarative/qdeclarativetextinput/data/validators.qml
+++ b/tests/auto/declarative/qdeclarativetextinput/data/validators.qml
@@ -9,14 +9,13 @@ Item {
 
     Column{
         TextInput { id: intInput;
-            validator: QIntValidator{top: 11; bottom: 2}
+            validator: IntValidator{top: 11; bottom: 2}
         }
         TextInput { id: dblInput;
-            validator: QDoubleValidator{top: 12.12; bottom: 2.93; decimals: 2; notation: QDoubleValidator.StandardNotation}
+            validator: DoubleValidator{top: 12.12; bottom: 2.93; decimals: 2; notation: DoubleValidator.StandardNotation}
         }
         TextInput { id: strInput;
-            //Requires QTBUG-8025 to be implemented first
-            //validator: QRegExpValidator { regExp: /[a-zA-z]{2,4}/;}
+            validator: RegExpValidator { regExp: /[a-zA-z]{2,4}/ }
         }
     }
         
diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
index febcec3..84e7182 100644
--- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
+++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -463,7 +463,6 @@ void tst_qdeclarativetextinput::validators()
     QVERIFY(strInput->hasFocus() == true);
     QTest::keyPress(canvas, Qt::Key_1);
     QTest::keyRelease(canvas, Qt::Key_1, Qt::NoModifier ,10);
-    QEXPECT_FAIL("","Will not work until QTBUG-8025 is resolved", Abort);
     QCOMPARE(strInput->text(), QLatin1String(""));
     QCOMPARE(strInput->hasAcceptableInput(), false);
     QTest::keyPress(canvas, Qt::Key_A);
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/model2.xml b/tests/auto/declarative/qdeclarativexmllistmodel/data/model2.xml
new file mode 100644
index 0000000..dab2ec6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/model2.xml
@@ -0,0 +1,14 @@
+<Pets>
+    <Pet>
+        <name>Polly</name>
+        <type>Parrot</type>
+        <age>12</age>
+        <size>Small</size>
+    </Pet>
+    <Pet>
+        <name>Penny</name>
+        <type>Turtle</type>
+        <age>4</age>
+        <size>Small</size>
+    </Pet>
+</Pets>
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
index 81cc922..74da79e 100644
--- a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
@@ -41,6 +41,8 @@
 #include <qtest.h>
 #include <QtTest/qsignalspy.h>
 #include <QtCore/qtimer.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qtemporaryfile.h>
 
 #ifdef QTEST_XMLPATTERNS
 #include <QtDeclarative/qdeclarativeengine.h>
@@ -53,6 +55,7 @@ typedef QList<QVariantList> QDeclarativeXmlModelData;
 
 Q_DECLARE_METATYPE(QList<QDeclarativeXmlListRange>)
 Q_DECLARE_METATYPE(QDeclarativeXmlModelData)
+Q_DECLARE_METATYPE(QDeclarativeXmlListModel::Status)
 
 class tst_qdeclarativexmllistmodel : public QObject
 
@@ -62,6 +65,10 @@ public:
     tst_qdeclarativexmllistmodel() {}
 
 private slots:
+    void initTestCase() {
+        qRegisterMetaType<QDeclarativeXmlListModel::Status>("QDeclarativeXmlListModel::Status");
+    }
+
     void buildModel();
     void missingFields();
     void cdata();
@@ -69,6 +76,11 @@ private slots:
     void roles();
     void roleErrors();
     void uniqueRoleNames();
+    void xml();
+    void xml_data();
+    void source();
+    void source_data();
+    void data();
     void reload();
     void useKeys();
     void useKeys_data();
@@ -181,7 +193,6 @@ void tst_qdeclarativexmllistmodel::attributes()
     QDeclarativeXmlListModel *model = qobject_cast<QDeclarativeXmlListModel*>(component.create());
     QVERIFY(model != 0);
     QTRY_COMPARE(model->count(), 5);
-
     QList<int> roles;
     roles << Qt::UserRole;
     QHash<int, QVariant> data = model->data(2, roles);
@@ -247,6 +258,113 @@ void tst_qdeclarativexmllistmodel::uniqueRoleNames()
     delete model;
 }
 
+
+void tst_qdeclarativexmllistmodel::xml()
+{
+    QFETCH(QString, xml);
+    QFETCH(int, count);
+
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model.qml"));
+    QDeclarativeXmlListModel *model = qobject_cast<QDeclarativeXmlListModel*>(component.create());
+    QSignalSpy spy(model, SIGNAL(statusChanged(QDeclarativeXmlListModel::Status)));
+
+    QCOMPARE(model->progress(), qreal(0.0));
+    QCOMPARE(model->status(), QDeclarativeXmlListModel::Loading);
+    QTRY_COMPARE(spy.count(), 1); spy.clear();
+    QCOMPARE(model->status(), QDeclarativeXmlListModel::Ready);
+    QCOMPARE(model->progress(), qreal(1.0));
+    QCOMPARE(model->count(), 9);
+
+    // if xml is empty (i.e. clearing) it won't have any effect if a source is set
+    if (xml.isEmpty())
+        model->setSource(QUrl());
+    model->setXml(xml);
+    QCOMPARE(model->progress(), qreal(1.0));   // immediately goes to 1.0 if using setXml()
+    QTRY_COMPARE(spy.count(), 1); spy.clear();
+    QCOMPARE(model->status(), QDeclarativeXmlListModel::Loading);
+    QTRY_COMPARE(spy.count(), 1); spy.clear();
+    QCOMPARE(model->status(), QDeclarativeXmlListModel::Ready);
+    QCOMPARE(model->count(), count);
+
+    delete model;
+}
+
+void tst_qdeclarativexmllistmodel::xml_data()
+{
+    QTest::addColumn<QString>("xml");
+    QTest::addColumn<int>("count");
+
+    QTest::newRow("xml with no items") << "<Pets></Pets>" << 0;
+    QTest::newRow("empty xml") << "" << 0;
+    QTest::newRow("one item") << "<Pets><Pet><name>Hobbes</name><type>Tiger</type><age>7</age><size>Large</size></Pet></Pets>" << 1;
+}
+
+void tst_qdeclarativexmllistmodel::source()
+{
+    QFETCH(QUrl, source);
+    QFETCH(int, count);
+    QFETCH(QDeclarativeXmlListModel::Status, status);
+
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model.qml"));
+    QDeclarativeXmlListModel *model = qobject_cast<QDeclarativeXmlListModel*>(component.create());
+    QSignalSpy spy(model, SIGNAL(statusChanged(QDeclarativeXmlListModel::Status)));
+
+    QCOMPARE(model->progress(), qreal(0.0));
+    QCOMPARE(model->status(), QDeclarativeXmlListModel::Loading);
+    QTRY_COMPARE(spy.count(), 1); spy.clear();
+    QCOMPARE(model->status(), QDeclarativeXmlListModel::Ready);
+    QCOMPARE(model->progress(), qreal(1.0));
+    QCOMPARE(model->count(), 9);
+
+    model->setSource(source);
+    QCOMPARE(model->progress(), qreal(0.0));
+    QTRY_COMPARE(spy.count(), 1); spy.clear();
+    QCOMPARE(model->status(), QDeclarativeXmlListModel::Loading);
+    QTRY_COMPARE(spy.count(), 1); spy.clear();
+    QCOMPARE(model->status(), status);
+    QCOMPARE(model->count(), count);
+    if (status == QDeclarativeXmlListModel::Ready)
+        QCOMPARE(model->progress(), qreal(1.0));
+
+    delete model;
+}
+
+void tst_qdeclarativexmllistmodel::source_data()
+{
+    QTest::addColumn<QUrl>("source");
+    QTest::addColumn<int>("count");
+    QTest::addColumn<QDeclarativeXmlListModel::Status>("status");
+
+    QTest::newRow("valid") << QUrl::fromLocalFile(SRCDIR "/data/model2.xml") << 2 << QDeclarativeXmlListModel::Ready;
+    QTest::newRow("invalid") << QUrl("http://blah.blah/blah.xml") << 0 << QDeclarativeXmlListModel::Error;
+
+    // empty file
+    QTemporaryFile *temp = new QTemporaryFile(this);
+    if (temp->open())
+        QTest::newRow("empty file") << QUrl::fromLocalFile(temp->fileName()) << 0 << QDeclarativeXmlListModel::Ready;
+    temp->close();
+}
+
+void tst_qdeclarativexmllistmodel::data()
+{
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model.qml"));
+    QDeclarativeXmlListModel *model = qobject_cast<QDeclarativeXmlListModel*>(component.create());    
+    QVERIFY(model != 0);
+
+    QHash<int,QVariant> blank;
+    for (int i=0; i<model->roles().count(); i++)
+        blank.insert(model->roles()[i], QVariant());
+    for (int i=0; i<9; i++)  {
+        QCOMPARE(model->data(i, model->roles()), blank);
+        for (int j=0; j<model->roles().count(); j++) {
+            QCOMPARE(model->data(i, j), QVariant());
+        }
+    }
+    QTRY_COMPARE(model->count(), 9);
+
+    delete model;
+}
+
 void tst_qdeclarativexmllistmodel::reload()
 {
     // If no keys are used, the model should be rebuilt from scratch when
diff --git a/tests/auto/declarative/visual/ListView/basic1.qml b/tests/auto/declarative/qmlvisual/ListView/basic1.qml
index 3c371a6..3c371a6 100644
--- a/tests/auto/declarative/visual/ListView/basic1.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/basic1.qml
diff --git a/tests/auto/declarative/visual/ListView/basic2.qml b/tests/auto/declarative/qmlvisual/ListView/basic2.qml
index bdba65e..bdba65e 100644
--- a/tests/auto/declarative/visual/ListView/basic2.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/basic2.qml
diff --git a/tests/auto/declarative/visual/ListView/basic3.qml b/tests/auto/declarative/qmlvisual/ListView/basic3.qml
index 05ac358..2d68c0a 100644
--- a/tests/auto/declarative/visual/ListView/basic3.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/basic3.qml
@@ -5,7 +5,7 @@ Rectangle {
     width: 200
     height: 300
     id: page
-    Listmodel {
+    ListModel {
         id: model
         ListElement {
             name: "January"
diff --git a/tests/auto/declarative/visual/ListView/basic4.qml b/tests/auto/declarative/qmlvisual/ListView/basic4.qml
index 3628bd3..7c68df1 100644
--- a/tests/auto/declarative/visual/ListView/basic4.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/basic4.qml
@@ -5,7 +5,7 @@ Rectangle {
     width: 200
     height: 300
     id: page
-    Listmodel {
+    ListModel {
         id: model
         ListElement {
             name: "January"
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/basic1.qml b/tests/auto/declarative/qmlvisual/ListView/data-MAC/basic1.qml
index 83b700d..83b700d 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/basic1.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/basic1.qml
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/basic2.qml b/tests/auto/declarative/qmlvisual/ListView/data-MAC/basic2.qml
index 1483512..1483512 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/basic2.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/basic2.qml
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/basic3.qml b/tests/auto/declarative/qmlvisual/ListView/data-MAC/basic3.qml
index bf68998..bf68998 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/basic3.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/basic3.qml
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/basic4.qml b/tests/auto/declarative/qmlvisual/ListView/data-MAC/basic4.qml
index 4aa9ab6..4aa9ab6 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/basic4.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/basic4.qml
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/itemlist.0.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.0.png
index 13b280c..13b280c 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/itemlist.0.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.0.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/itemlist.1.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.1.png
index 402872b..402872b 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/itemlist.1.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.1.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/itemlist.2.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.2.png
index afd0830..afd0830 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/itemlist.2.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.2.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/itemlist.3.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.3.png
index 7c15f61..7c15f61 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/itemlist.3.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.3.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/itemlist.4.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.4.png
index afd0830..afd0830 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/itemlist.4.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.4.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/itemlist.5.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.5.png
index fddf1cb..fddf1cb 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/itemlist.5.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.5.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/itemlist.6.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.6.png
index 13b280c..13b280c 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/itemlist.6.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.6.png
diff --git a/tests/auto/declarative/visual/ListView/data/itemlist.qml b/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.qml
index 073749f..073749f 100644
--- a/tests/auto/declarative/visual/ListView/data/itemlist.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/itemlist.qml
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/listview.0.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.0.png
index a1ab987..a1ab987 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/listview.0.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.0.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/listview.1.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.1.png
index a1ab987..a1ab987 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/listview.1.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.1.png
diff --git a/tests/auto/declarative/visual/ListView/data/listview.10.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.10.png
index dcfca3f..dcfca3f 100644
--- a/tests/auto/declarative/visual/ListView/data/listview.10.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.10.png
diff --git a/tests/auto/declarative/visual/ListView/data/listview.11.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.11.png
index 7cc4047..7cc4047 100644
--- a/tests/auto/declarative/visual/ListView/data/listview.11.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.11.png
diff --git a/tests/auto/declarative/visual/ListView/data/listview.12.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.12.png
index a97f4ad..a97f4ad 100644
--- a/tests/auto/declarative/visual/ListView/data/listview.12.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.12.png
diff --git a/tests/auto/declarative/visual/ListView/data/listview.13.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.13.png
index 7a8c6bd..7a8c6bd 100644
--- a/tests/auto/declarative/visual/ListView/data/listview.13.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.13.png
diff --git a/tests/auto/declarative/visual/ListView/data/listview.14.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.14.png
index ae47356..ae47356 100644
--- a/tests/auto/declarative/visual/ListView/data/listview.14.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.14.png
diff --git a/tests/auto/declarative/visual/ListView/data/listview.15.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.15.png
index b3a7260..b3a7260 100644
--- a/tests/auto/declarative/visual/ListView/data/listview.15.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.15.png
diff --git a/tests/auto/declarative/visual/ListView/data/listview.16.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.16.png
index 581e824..581e824 100644
--- a/tests/auto/declarative/visual/ListView/data/listview.16.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.16.png
diff --git a/tests/auto/declarative/visual/ListView/data/listview.17.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.17.png
index 581e824..581e824 100644
--- a/tests/auto/declarative/visual/ListView/data/listview.17.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.17.png
diff --git a/tests/auto/declarative/visual/ListView/data/listview.18.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.18.png
index 581e824..581e824 100644
--- a/tests/auto/declarative/visual/ListView/data/listview.18.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.18.png
diff --git a/tests/auto/declarative/visual/ListView/data/listview.19.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.19.png
index 581e824..581e824 100644
--- a/tests/auto/declarative/visual/ListView/data/listview.19.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.19.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/listview.2.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.2.png
index 9877b92..9877b92 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/listview.2.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.2.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/listview.3.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.3.png
index 603bd24..603bd24 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/listview.3.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.3.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/listview.4.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.4.png
index 5fdfbb8..5fdfbb8 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/listview.4.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.4.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/listview.5.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.5.png
index a1ab987..a1ab987 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/listview.5.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.5.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/listview.6.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.6.png
index 9ccf9b0..9ccf9b0 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/listview.6.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.6.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/listview.7.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.7.png
index 6b40e1b..6b40e1b 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/listview.7.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.7.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/listview.8.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.8.png
index 2fda36d..2fda36d 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/listview.8.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.8.png
diff --git a/tests/auto/declarative/visual/ListView/data/listview.9.png b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.9.png
index 581e824..581e824 100644
--- a/tests/auto/declarative/visual/ListView/data/listview.9.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.9.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/listview.qml b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.qml
index 3765668..3765668 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/listview.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/data-MAC/listview.qml
diff --git a/tests/auto/declarative/visual/ListView/data-X11/basic1.qml b/tests/auto/declarative/qmlvisual/ListView/data-X11/basic1.qml
index ae59b14..ae59b14 100644
--- a/tests/auto/declarative/visual/ListView/data-X11/basic1.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/data-X11/basic1.qml
diff --git a/tests/auto/declarative/visual/ListView/data-X11/basic2.qml b/tests/auto/declarative/qmlvisual/ListView/data-X11/basic2.qml
index ff19d22..ff19d22 100644
--- a/tests/auto/declarative/visual/ListView/data-X11/basic2.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/data-X11/basic2.qml
diff --git a/tests/auto/declarative/visual/ListView/data-X11/basic3.qml b/tests/auto/declarative/qmlvisual/ListView/data-X11/basic3.qml
index 2f33cae..2f33cae 100644
--- a/tests/auto/declarative/visual/ListView/data-X11/basic3.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/data-X11/basic3.qml
diff --git a/tests/auto/declarative/visual/ListView/data-X11/basic4.qml b/tests/auto/declarative/qmlvisual/ListView/data-X11/basic4.qml
index 4b1c5cf..4b1c5cf 100644
--- a/tests/auto/declarative/visual/ListView/data-X11/basic4.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/data-X11/basic4.qml
diff --git a/tests/auto/declarative/visual/ListView/data/basic1.qml b/tests/auto/declarative/qmlvisual/ListView/data/basic1.qml
index 4cd44fc..4cd44fc 100644
--- a/tests/auto/declarative/visual/ListView/data/basic1.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/data/basic1.qml
diff --git a/tests/auto/declarative/visual/ListView/data/basic2.qml b/tests/auto/declarative/qmlvisual/ListView/data/basic2.qml
index 34ad5ed..34ad5ed 100644
--- a/tests/auto/declarative/visual/ListView/data/basic2.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/data/basic2.qml
diff --git a/tests/auto/declarative/visual/ListView/data/basic3.qml b/tests/auto/declarative/qmlvisual/ListView/data/basic3.qml
index 1c5ddb0..1c5ddb0 100644
--- a/tests/auto/declarative/visual/ListView/data/basic3.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/data/basic3.qml
diff --git a/tests/auto/declarative/visual/ListView/data/basic4.qml b/tests/auto/declarative/qmlvisual/ListView/data/basic4.qml
index d121d91..d121d91 100644
--- a/tests/auto/declarative/visual/ListView/data/basic4.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/data/basic4.qml
diff --git a/tests/auto/declarative/visual/ListView/data/itemlist.0.png b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.0.png
index a1947ca..a1947ca 100644
--- a/tests/auto/declarative/visual/ListView/data/itemlist.0.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.0.png
diff --git a/tests/auto/declarative/visual/ListView/data/itemlist.1.png b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.1.png
index d27b7fa..d27b7fa 100644
--- a/tests/auto/declarative/visual/ListView/data/itemlist.1.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.1.png
diff --git a/tests/auto/declarative/visual/ListView/data/itemlist.2.png b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.2.png
index fdab8c6..fdab8c6 100644
--- a/tests/auto/declarative/visual/ListView/data/itemlist.2.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.2.png
diff --git a/tests/auto/declarative/visual/ListView/data/itemlist.3.png b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.3.png
index dc321a8..dc321a8 100644
--- a/tests/auto/declarative/visual/ListView/data/itemlist.3.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.3.png
diff --git a/tests/auto/declarative/visual/ListView/data/itemlist.4.png b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.4.png
index fdab8c6..fdab8c6 100644
--- a/tests/auto/declarative/visual/ListView/data/itemlist.4.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.4.png
diff --git a/tests/auto/declarative/visual/ListView/data/itemlist.5.png b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.5.png
index 15b51cb..15b51cb 100644
--- a/tests/auto/declarative/visual/ListView/data/itemlist.5.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.5.png
diff --git a/tests/auto/declarative/visual/ListView/data/itemlist.6.png b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.6.png
index a1947ca..a1947ca 100644
--- a/tests/auto/declarative/visual/ListView/data/itemlist.6.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.6.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/itemlist.qml b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.qml
index 073749f..073749f 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/itemlist.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/data/itemlist.qml
diff --git a/tests/auto/declarative/visual/ListView/data/listview.0.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.0.png
index 581e824..581e824 100644
--- a/tests/auto/declarative/visual/ListView/data/listview.0.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/listview.0.png
diff --git a/tests/auto/declarative/visual/ListView/data/listview.1.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.1.png
index 581e824..581e824 100644
--- a/tests/auto/declarative/visual/ListView/data/listview.1.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/listview.1.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/listview.10.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.10.png
index dcfca3f..dcfca3f 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/listview.10.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/listview.10.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/listview.11.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.11.png
index 7cc4047..7cc4047 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/listview.11.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/listview.11.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/listview.12.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.12.png
index a97f4ad..a97f4ad 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/listview.12.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/listview.12.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/listview.13.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.13.png
index 7a8c6bd..7a8c6bd 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/listview.13.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/listview.13.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/listview.14.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.14.png
index ae47356..ae47356 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/listview.14.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/listview.14.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/listview.15.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.15.png
index b3a7260..b3a7260 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/listview.15.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/listview.15.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/listview.16.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.16.png
index 581e824..581e824 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/listview.16.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/listview.16.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/listview.17.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.17.png
index 581e824..581e824 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/listview.17.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/listview.17.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/listview.18.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.18.png
index 581e824..581e824 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/listview.18.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/listview.18.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/listview.19.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.19.png
index 581e824..581e824 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/listview.19.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/listview.19.png
diff --git a/tests/auto/declarative/visual/ListView/data/listview.2.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.2.png
index 579c68c..579c68c 100644
--- a/tests/auto/declarative/visual/ListView/data/listview.2.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/listview.2.png
diff --git a/tests/auto/declarative/visual/ListView/data/listview.3.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.3.png
index b3a7260..b3a7260 100644
--- a/tests/auto/declarative/visual/ListView/data/listview.3.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/listview.3.png
diff --git a/tests/auto/declarative/visual/ListView/data/listview.4.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.4.png
index 19758b0..19758b0 100644
--- a/tests/auto/declarative/visual/ListView/data/listview.4.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/listview.4.png
diff --git a/tests/auto/declarative/visual/ListView/data/listview.5.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.5.png
index 581e824..581e824 100644
--- a/tests/auto/declarative/visual/ListView/data/listview.5.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/listview.5.png
diff --git a/tests/auto/declarative/visual/ListView/data/listview.6.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.6.png
index 82cac48..82cac48 100644
--- a/tests/auto/declarative/visual/ListView/data/listview.6.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/listview.6.png
diff --git a/tests/auto/declarative/visual/ListView/data/listview.7.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.7.png
index 9277a82..9277a82 100644
--- a/tests/auto/declarative/visual/ListView/data/listview.7.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/listview.7.png
diff --git a/tests/auto/declarative/visual/ListView/data/listview.8.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.8.png
index 8c36da7..8c36da7 100644
--- a/tests/auto/declarative/visual/ListView/data/listview.8.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/listview.8.png
diff --git a/tests/auto/declarative/visual/ListView/data-MAC/listview.9.png b/tests/auto/declarative/qmlvisual/ListView/data/listview.9.png
index 581e824..581e824 100644
--- a/tests/auto/declarative/visual/ListView/data-MAC/listview.9.png
+++ b/tests/auto/declarative/qmlvisual/ListView/data/listview.9.png
diff --git a/tests/auto/declarative/visual/ListView/data/listview.qml b/tests/auto/declarative/qmlvisual/ListView/data/listview.qml
index cd5d7b4..cd5d7b4 100644
--- a/tests/auto/declarative/visual/ListView/data/listview.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/data/listview.qml
diff --git a/tests/auto/declarative/visual/ListView/itemlist.qml b/tests/auto/declarative/qmlvisual/ListView/itemlist.qml
index 8cbbdb0..8cbbdb0 100644
--- a/tests/auto/declarative/visual/ListView/itemlist.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/itemlist.qml
diff --git a/tests/auto/declarative/visual/ListView/listview.qml b/tests/auto/declarative/qmlvisual/ListView/listview.qml
index fb9eecd..fb9eecd 100644
--- a/tests/auto/declarative/visual/ListView/listview.qml
+++ b/tests/auto/declarative/qmlvisual/ListView/listview.qml
diff --git a/tests/auto/declarative/visual/Package_Views/data/packageviews.0.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.0.png
index c59b816..c59b816 100644
--- a/tests/auto/declarative/visual/Package_Views/data/packageviews.0.png
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.0.png
diff --git a/tests/auto/declarative/visual/Package_Views/data/packageviews.1.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.1.png
index d4dbc70..d4dbc70 100644
--- a/tests/auto/declarative/visual/Package_Views/data/packageviews.1.png
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.1.png
diff --git a/tests/auto/declarative/visual/Package_Views/data/packageviews.10.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.10.png
index ed9d345..ed9d345 100644
--- a/tests/auto/declarative/visual/Package_Views/data/packageviews.10.png
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.10.png
diff --git a/tests/auto/declarative/visual/Package_Views/data/packageviews.11.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.11.png
index ed9d345..ed9d345 100644
--- a/tests/auto/declarative/visual/Package_Views/data/packageviews.11.png
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.11.png
diff --git a/tests/auto/declarative/visual/Package_Views/data/packageviews.12.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.12.png
index 45ee400..45ee400 100644
--- a/tests/auto/declarative/visual/Package_Views/data/packageviews.12.png
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.12.png
diff --git a/tests/auto/declarative/visual/Package_Views/data/packageviews.13.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.13.png
index c73e158..c73e158 100644
--- a/tests/auto/declarative/visual/Package_Views/data/packageviews.13.png
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.13.png
diff --git a/tests/auto/declarative/visual/Package_Views/data/packageviews.14.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.14.png
index e2fff6d..e2fff6d 100644
--- a/tests/auto/declarative/visual/Package_Views/data/packageviews.14.png
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.14.png
diff --git a/tests/auto/declarative/visual/Package_Views/data/packageviews.15.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.15.png
index d7a13df..d7a13df 100644
--- a/tests/auto/declarative/visual/Package_Views/data/packageviews.15.png
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.15.png
diff --git a/tests/auto/declarative/visual/Package_Views/data/packageviews.16.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.16.png
index beb3094..beb3094 100644
--- a/tests/auto/declarative/visual/Package_Views/data/packageviews.16.png
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.16.png
diff --git a/tests/auto/declarative/visual/Package_Views/data/packageviews.17.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.17.png
index beb3094..beb3094 100644
--- a/tests/auto/declarative/visual/Package_Views/data/packageviews.17.png
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.17.png
diff --git a/tests/auto/declarative/visual/Package_Views/data/packageviews.18.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.18.png
index beb3094..beb3094 100644
--- a/tests/auto/declarative/visual/Package_Views/data/packageviews.18.png
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.18.png
diff --git a/tests/auto/declarative/visual/Package_Views/data/packageviews.19.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.19.png
index d3a2650..d3a2650 100644
--- a/tests/auto/declarative/visual/Package_Views/data/packageviews.19.png
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.19.png
diff --git a/tests/auto/declarative/visual/Package_Views/data/packageviews.2.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.2.png
index a09dd28..a09dd28 100644
--- a/tests/auto/declarative/visual/Package_Views/data/packageviews.2.png
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.2.png
diff --git a/tests/auto/declarative/visual/Package_Views/data/packageviews.20.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.20.png
index 600462a..600462a 100644
--- a/tests/auto/declarative/visual/Package_Views/data/packageviews.20.png
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.20.png
diff --git a/tests/auto/declarative/visual/Package_Views/data/packageviews.21.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.21.png
index 6defca0..6defca0 100644
--- a/tests/auto/declarative/visual/Package_Views/data/packageviews.21.png
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.21.png
diff --git a/tests/auto/declarative/visual/Package_Views/data/packageviews.22.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.22.png
index 91967e1..91967e1 100644
--- a/tests/auto/declarative/visual/Package_Views/data/packageviews.22.png
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.22.png
diff --git a/tests/auto/declarative/visual/Package_Views/data/packageviews.3.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.3.png
index d099a79..d099a79 100644
--- a/tests/auto/declarative/visual/Package_Views/data/packageviews.3.png
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.3.png
diff --git a/tests/auto/declarative/visual/Package_Views/data/packageviews.4.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.4.png
index 385efc8..385efc8 100644
--- a/tests/auto/declarative/visual/Package_Views/data/packageviews.4.png
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.4.png
diff --git a/tests/auto/declarative/visual/Package_Views/data/packageviews.5.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.5.png
index 25a7c3c..25a7c3c 100644
--- a/tests/auto/declarative/visual/Package_Views/data/packageviews.5.png
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.5.png
diff --git a/tests/auto/declarative/visual/Package_Views/data/packageviews.6.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.6.png
index 25a7c3c..25a7c3c 100644
--- a/tests/auto/declarative/visual/Package_Views/data/packageviews.6.png
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.6.png
diff --git a/tests/auto/declarative/visual/Package_Views/data/packageviews.7.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.7.png
index 7a24f51..7a24f51 100644
--- a/tests/auto/declarative/visual/Package_Views/data/packageviews.7.png
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.7.png
diff --git a/tests/auto/declarative/visual/Package_Views/data/packageviews.8.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.8.png
index 7a24f51..7a24f51 100644
--- a/tests/auto/declarative/visual/Package_Views/data/packageviews.8.png
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.8.png
diff --git a/tests/auto/declarative/visual/Package_Views/data/packageviews.9.png b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.9.png
index 45ee400..45ee400 100644
--- a/tests/auto/declarative/visual/Package_Views/data/packageviews.9.png
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.9.png
diff --git a/tests/auto/declarative/visual/Package_Views/data/packageviews.qml b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.qml
index d062667..d062667 100644
--- a/tests/auto/declarative/visual/Package_Views/data/packageviews.qml
+++ b/tests/auto/declarative/qmlvisual/Package_Views/data/packageviews.qml
diff --git a/tests/auto/declarative/visual/Package_Views/packageviews.qml b/tests/auto/declarative/qmlvisual/Package_Views/packageviews.qml
index cf3f9f7..f6c033f 100644
--- a/tests/auto/declarative/visual/Package_Views/packageviews.qml
+++ b/tests/auto/declarative/qmlvisual/Package_Views/packageviews.qml
@@ -6,9 +6,9 @@ Rectangle {
     height: 200
     color: "black"
 
-    VisualDatamodel {
+    VisualDataModel {
         id: model
-        model: Listmodel {
+        model: ListModel {
             ListElement { itemColor: "red" }
             ListElement { itemColor: "green" }
             ListElement { itemColor: "blue" }
diff --git a/tests/auto/declarative/visual/animation/bindinganimation/bindinganimation.qml b/tests/auto/declarative/qmlvisual/animation/bindinganimation/bindinganimation.qml
index 70c14cf..70c14cf 100644
--- a/tests/auto/declarative/visual/animation/bindinganimation/bindinganimation.qml
+++ b/tests/auto/declarative/qmlvisual/animation/bindinganimation/bindinganimation.qml
diff --git a/tests/auto/declarative/visual/animation/bindinganimation/data/bindinganimation.0.png b/tests/auto/declarative/qmlvisual/animation/bindinganimation/data/bindinganimation.0.png
index 1b08c81..1b08c81 100644
--- a/tests/auto/declarative/visual/animation/bindinganimation/data/bindinganimation.0.png
+++ b/tests/auto/declarative/qmlvisual/animation/bindinganimation/data/bindinganimation.0.png
diff --git a/tests/auto/declarative/visual/animation/bindinganimation/data/bindinganimation.1.png b/tests/auto/declarative/qmlvisual/animation/bindinganimation/data/bindinganimation.1.png
index f3074fc..f3074fc 100644
--- a/tests/auto/declarative/visual/animation/bindinganimation/data/bindinganimation.1.png
+++ b/tests/auto/declarative/qmlvisual/animation/bindinganimation/data/bindinganimation.1.png
diff --git a/tests/auto/declarative/visual/animation/bindinganimation/data/bindinganimation.2.png b/tests/auto/declarative/qmlvisual/animation/bindinganimation/data/bindinganimation.2.png
index 1b08c81..1b08c81 100644
--- a/tests/auto/declarative/visual/animation/bindinganimation/data/bindinganimation.2.png
+++ b/tests/auto/declarative/qmlvisual/animation/bindinganimation/data/bindinganimation.2.png
diff --git a/tests/auto/declarative/visual/animation/bindinganimation/data/bindinganimation.3.png b/tests/auto/declarative/qmlvisual/animation/bindinganimation/data/bindinganimation.3.png
index e2560e0..e2560e0 100644
--- a/tests/auto/declarative/visual/animation/bindinganimation/data/bindinganimation.3.png
+++ b/tests/auto/declarative/qmlvisual/animation/bindinganimation/data/bindinganimation.3.png
diff --git a/tests/auto/declarative/visual/animation/bindinganimation/data/bindinganimation.4.png b/tests/auto/declarative/qmlvisual/animation/bindinganimation/data/bindinganimation.4.png
index 2ddde86..2ddde86 100644
--- a/tests/auto/declarative/visual/animation/bindinganimation/data/bindinganimation.4.png
+++ b/tests/auto/declarative/qmlvisual/animation/bindinganimation/data/bindinganimation.4.png
diff --git a/tests/auto/declarative/visual/animation/bindinganimation/data/bindinganimation.5.png b/tests/auto/declarative/qmlvisual/animation/bindinganimation/data/bindinganimation.5.png
index f3074fc..f3074fc 100644
--- a/tests/auto/declarative/visual/animation/bindinganimation/data/bindinganimation.5.png
+++ b/tests/auto/declarative/qmlvisual/animation/bindinganimation/data/bindinganimation.5.png
diff --git a/tests/auto/declarative/visual/animation/bindinganimation/data/bindinganimation.6.png b/tests/auto/declarative/qmlvisual/animation/bindinganimation/data/bindinganimation.6.png
index 1b08c81..1b08c81 100644
--- a/tests/auto/declarative/visual/animation/bindinganimation/data/bindinganimation.6.png
+++ b/tests/auto/declarative/qmlvisual/animation/bindinganimation/data/bindinganimation.6.png
diff --git a/tests/auto/declarative/visual/animation/bindinganimation/data/bindinganimation.qml b/tests/auto/declarative/qmlvisual/animation/bindinganimation/data/bindinganimation.qml
index 8297c5a..8297c5a 100644
--- a/tests/auto/declarative/visual/animation/bindinganimation/data/bindinganimation.qml
+++ b/tests/auto/declarative/qmlvisual/animation/bindinganimation/data/bindinganimation.qml
diff --git a/tests/auto/declarative/visual/animation/colorAnimation/colorAnimation.qml b/tests/auto/declarative/qmlvisual/animation/colorAnimation/colorAnimation.qml
index f205ae8..f205ae8 100644
--- a/tests/auto/declarative/visual/animation/colorAnimation/colorAnimation.qml
+++ b/tests/auto/declarative/qmlvisual/animation/colorAnimation/colorAnimation.qml
diff --git a/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.0.png b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.0.png
index f4a6cfd..e6ea16d 100644
--- a/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.0.png
+++ b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.0.png
diff --git a/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.1.png b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.1.png
new file mode 100644
index 0000000..b75ba61
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.1.png
diff --git a/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.2.png b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.2.png
index f4a6cfd..4320f6f 100644
--- a/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.2.png
+++ b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.2.png
diff --git a/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.qml b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.qml
index 900bf5c..4d0959a 100644
--- a/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.qml
+++ b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.qml
@@ -170,91 +170,91 @@ VisualTest {
     }
     Frame {
         msec: 608
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "acc736435c9f84aa82941ba561bc5dbc"
     }
     Frame {
         msec: 624
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "e5bda0daf98288ce18db6ce06eda3ba0"
     }
     Frame {
         msec: 640
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "d35008f75b8c992f80fb16ba7203649d"
     }
     Frame {
         msec: 656
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "14f43e0784ddf42ea8550db88c501bf1"
     }
     Frame {
         msec: 672
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "02276e158b5391480b1bdeaadf1fb903"
     }
     Frame {
         msec: 688
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "35d9513eb97a2c482b7cd197de910934"
     }
     Frame {
         msec: 704
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "faf0fd681e60bb2489099f5df772b6cd"
     }
     Frame {
         msec: 720
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "a863d3e346f94785a3a392fdc91526eb"
     }
     Frame {
         msec: 736
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "fdf328d3f6eb8410da59a91345e41a44"
     }
     Frame {
         msec: 752
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "83514a3b10d5be8f6c3b128d0f3e0b1c"
     }
     Frame {
         msec: 768
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "ead0eae76cd00189075964671effbaea"
     }
     Frame {
         msec: 784
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "24d2457fcd51490fda23071bf9929d12"
     }
     Frame {
         msec: 800
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "1478683446cf543dacbe31d0b76a98a6"
     }
     Frame {
         msec: 816
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "99f7da1f31fe920f6c02add4042ae925"
     }
     Frame {
         msec: 832
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "22def892006cf66667770b0f17baf6c0"
     }
     Frame {
         msec: 848
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "6a36d5a77099bfd58baf285478ff04e4"
     }
     Frame {
         msec: 864
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "6258150666b59b20ab476724c07fc20c"
     }
     Frame {
         msec: 880
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "f1636315bc950a6dd400d9c7ed263b88"
     }
     Frame {
         msec: 896
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "18447ea8dc2e8da956788e5b3cf3790a"
     }
     Frame {
         msec: 912
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "1d2a6e65997a73e9e670356c8e8b63b2"
     }
     Frame {
         msec: 928
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "bed0242c0f9ef229d1392835286d5782"
     }
     Frame {
         msec: 944
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "88923c190e9e5beadef8a409c06df9d6"
     }
     Frame {
         msec: 960
@@ -262,239 +262,239 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "85b1821cc50f2a9f3ed6944f792b7a2f"
     }
     Frame {
         msec: 992
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "395195716d76bc0be7b2033ed37a7a1c"
     }
     Frame {
         msec: 1008
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "243dbffcf416926242bbcb7348974c4c"
     }
     Frame {
         msec: 1024
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "a755068679616d8ac65c2aa7431f2a19"
     }
     Frame {
         msec: 1040
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "e8249b35a47eb492cbdf2d91cc8426f0"
     }
     Frame {
         msec: 1056
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "15f3da1c0e6f0779b96859d51171dd27"
     }
     Frame {
         msec: 1072
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "258c0c756aac3de743b43051f2aace6b"
     }
     Frame {
         msec: 1088
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "a58b9fdf301d72b2cc5c93934cc8927b"
     }
     Frame {
         msec: 1104
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "a9181d30870d472521f8904818ce520f"
     }
     Frame {
         msec: 1120
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "7f9e94069ccf3897c26a71bd7becd903"
     }
     Frame {
         msec: 1136
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "bdf305c2f46cdb86dbf57b1e0cc5a65b"
     }
     Frame {
         msec: 1152
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "fe5b6865d7e4fc7d1d42c1e74f8666f7"
     }
     Frame {
         msec: 1168
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "734f0de45a6e34c9eab7ef606196f96a"
     }
     Frame {
         msec: 1184
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "02a361c4534fdf7f286dc3e6dc23275c"
     }
     Frame {
         msec: 1200
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "e649155ad69999c14b92f6561e4d1185"
     }
     Frame {
         msec: 1216
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "01af177084fab755d622973f64b92018"
     }
     Frame {
         msec: 1232
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "097cc4a082dfab995d213a3a73883c97"
     }
     Frame {
         msec: 1248
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "d7b4239a3280b1eb8e885e3f422df8e9"
     }
     Frame {
         msec: 1264
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "59893977994e34e83f91e7ce3ad65d6d"
     }
     Frame {
         msec: 1280
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "b68e3fbb5cdcd6bd96df7dec558db42b"
     }
     Frame {
         msec: 1296
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "94ad0580648f36a1e18a9ea7e249b04d"
     }
     Frame {
         msec: 1312
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "750a4c01d2f5806a89a1c6cc6a9b9a68"
     }
     Frame {
         msec: 1328
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "4f109f50f388f1bfa4bc6b03b3e6e514"
     }
     Frame {
         msec: 1344
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "c6168d5cf27a533e8ee636637667be47"
     }
     Frame {
         msec: 1360
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "f8120547bed987aa34c00da5a01a4d1e"
     }
     Frame {
         msec: 1376
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "cbff526136fa2c128c8b898fbbef9e5c"
     }
     Frame {
         msec: 1392
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "f29e52398fab1a239a63df4c32f2fc69"
     }
     Frame {
         msec: 1408
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "7178bfe86fd2fd513218b33760460f8d"
     }
     Frame {
         msec: 1424
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "ca83285bc8ac633403896fe976896eb0"
     }
     Frame {
         msec: 1440
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "96ba486c09cc69d5aa38c46c00df1181"
     }
     Frame {
         msec: 1456
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "b88eab335842787869f4a14824c19dd8"
     }
     Frame {
         msec: 1472
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "065aa59012729e1e1a246a2083142690"
     }
     Frame {
         msec: 1488
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "dd0e98c8398861002c5f178c5f9f612d"
     }
     Frame {
         msec: 1504
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "04192c2b545948048eccf4d81bbde198"
     }
     Frame {
         msec: 1520
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "bb7502c7208281ef9fd41714ab88a1a8"
     }
     Frame {
         msec: 1536
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "5397195471890d08b703dca101e5bc7c"
     }
     Frame {
         msec: 1552
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "4c678cdbebb2ffd2cbf012ca77800cde"
     }
     Frame {
         msec: 1568
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "0d7a34ecd0c7f52b2c015037bf1902c6"
     }
     Frame {
         msec: 1584
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "fd9d5048be749ac4369fda2d018b43ae"
     }
     Frame {
         msec: 1600
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "93ee03795cd57ae6f7fe3a020b039ad4"
     }
     Frame {
         msec: 1616
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "5e1118963f219c39761ca7fbf564a9ca"
     }
     Frame {
         msec: 1632
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "8f40038741903150136170503649d941"
     }
     Frame {
         msec: 1648
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "b087b7d0aa6224821f8e18718ff5e77d"
     }
     Frame {
         msec: 1664
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "aa46b04a3c67dc772265ed2901955565"
     }
     Frame {
         msec: 1680
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "ac024bf2aeb4becdf31a09fe0a6db8f3"
     }
     Frame {
         msec: 1696
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "13745a174e4d06e2108a5bf125ba50cc"
     }
     Frame {
         msec: 1712
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "bd972f0d8e230eca0b3fea1b8c960c08"
     }
     Frame {
         msec: 1728
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "cbdbec802a58e7ced0cf45b3ab0bc0ba"
     }
     Frame {
         msec: 1744
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "5128584c50305c7d218b81b8367fa3d5"
     }
     Frame {
         msec: 1760
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "a71461d3593f3685620668916de870bd"
     }
     Frame {
         msec: 1776
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "74ebac8f32cf044b58d9883dbcd9a722"
     }
     Frame {
         msec: 1792
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "fedc5b638f339b90fe59b478721e65b7"
     }
     Frame {
         msec: 1808
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "8593a81be812edf54ec94da8ae9c1314"
     }
     Frame {
         msec: 1824
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "4e9b083075bc5e9287a8abc982778b56"
     }
     Frame {
         msec: 1840
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "1d6f02aa99afa47d77fc49ab894b365a"
     }
     Frame {
         msec: 1856
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "a204feec783b3b05de4c209c21745826"
     }
     Frame {
         msec: 1872
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "665a2a8ff00b9663157802767f504754"
     }
     Frame {
         msec: 1888
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "624fb09ebe60cb87d767faf8d2420b1e"
     }
     Frame {
         msec: 1904
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "e5af0cdc33f3275a25abb09e9165f310"
     }
     Frame {
         msec: 1920
@@ -502,171 +502,171 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "e7aa6374c73832e57ceb2427a1e258aa"
     }
     Frame {
         msec: 1952
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "b5abd0dff1ab076faac7cc226e83f5d0"
     }
     Frame {
         msec: 1968
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "b759acc35bccff8efc2e6fe276ddc0f7"
     }
     Frame {
         msec: 1984
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "ce52e18c1f7732768779863b45314ff5"
     }
     Frame {
         msec: 2000
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "99d30652559dd6931e0c95543eeaa149"
     }
     Frame {
         msec: 2016
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "ffbd9a00e05e085b89296d19d5caec57"
     }
     Frame {
         msec: 2032
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "9c9d658b9c25602816b8066bf19105db"
     }
     Frame {
         msec: 2048
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "2b7fd058e6601e22a30bb7106b1c683b"
     }
     Frame {
         msec: 2064
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "f4c7e26b19ee0a3e7c9688685eb7bd05"
     }
     Frame {
         msec: 2080
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "0dc6d593bceff56b7f81f2a49d37fefb"
     }
     Frame {
         msec: 2096
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "9bfd7ad5091ccbdde43c593e133a7b10"
     }
     Frame {
         msec: 2112
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "2703b617937914a90ea42ebf249d79ee"
     }
     Frame {
         msec: 2128
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "b77e2983138254016c4cca53100f46fa"
     }
     Frame {
         msec: 2144
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "60c4dd24187d1281081479e586f02b37"
     }
     Frame {
         msec: 2160
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "62f2511abd99ef1231c9fa4b91d4abfe"
     }
     Frame {
         msec: 2176
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "e309b3353fd174e883d309571caddc98"
     }
     Frame {
         msec: 2192
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "1e2d6a134c7b12dde551b148ef4f088c"
     }
     Frame {
         msec: 2208
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "e5dc5450604a491cc24a0dcf5c278b58"
     }
     Frame {
         msec: 2224
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "c8dae97c10e1962c1e6a51ab3ab8579e"
     }
     Frame {
         msec: 2240
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "4e1b7e06f55fb084080689b474f1fe1d"
     }
     Frame {
         msec: 2256
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "b4639c907fa937bf15fac62421170cd8"
     }
     Frame {
         msec: 2272
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "c250208a0caeb5f6cb4d3aac3d7d350b"
     }
     Frame {
         msec: 2288
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "a73351eabecf0d71149efe31f197413e"
     }
     Frame {
         msec: 2304
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "479425f1b7aff79e4dfb7fca534af018"
     }
     Frame {
         msec: 2320
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "046d0f0040a52d1f26ba9f7c5de06ef4"
     }
     Frame {
         msec: 2336
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "655778bf13c6080903150b0eb43a7edc"
     }
     Frame {
         msec: 2352
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "72da0bbe81514870655fdd3354adac60"
     }
     Frame {
         msec: 2368
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "defe0bdf675c65fff55aaaced1e4dae7"
     }
     Frame {
         msec: 2384
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "c988628b6c3d3780e9a865c7694926cd"
     }
     Frame {
         msec: 2400
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "5ab17563655231089edd986ff13d6012"
     }
     Frame {
         msec: 2416
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "c1adff1d2e5800ed466d1691d3b17382"
     }
     Frame {
         msec: 2432
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "70129ba01fbb19592b9dc0d0a3b3e7df"
     }
     Frame {
         msec: 2448
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "0000829ef7ed908bf430d42904d59cc2"
     }
     Frame {
         msec: 2464
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "843d2927f50ab87b4a86b7a6aaeed91f"
     }
     Frame {
         msec: 2480
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "da86d21756025e7de8050586d5e2a1f8"
     }
     Frame {
         msec: 2496
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "48dd1bd6580133b0793fee327ea4f1e6"
     }
     Frame {
         msec: 2512
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "f0618193dcd0ba2837249515a1898b1c"
     }
     Frame {
         msec: 2528
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "a530184e57251065286c0cbba7301e9c"
     }
     Frame {
         msec: 2544
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "64a1d7203973d65dd342793007a61c58"
     }
     Frame {
         msec: 2560
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "5b830dfc6ba442772de87d75d5a578de"
     }
     Frame {
         msec: 2576
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "5563b056b0409b65f60dd16dd0dd890e"
     }
     Frame {
         msec: 2592
-        hash: "8c0fcda4f8956394c53fc4ba18caa850"
+        hash: "b8bcf9ad2ca8720c11563a23d8280804"
     }
     Frame {
         msec: 2608
@@ -931,7 +931,7 @@ VisualTest {
     Key {
         type: 6
         key: 16777249
-        modifiers: 0
+        modifiers: 67108864
         text: ""
         autorep: false
         count: 1
diff --git a/tests/auto/declarative/visual/animation/easing/data/easing.0.png b/tests/auto/declarative/qmlvisual/animation/easing/data/easing.0.png
index 4f75bfd..4f75bfd 100644
--- a/tests/auto/declarative/visual/animation/easing/data/easing.0.png
+++ b/tests/auto/declarative/qmlvisual/animation/easing/data/easing.0.png
diff --git a/tests/auto/declarative/visual/animation/easing/data/easing.1.png b/tests/auto/declarative/qmlvisual/animation/easing/data/easing.1.png
index dc17765..dc17765 100644
--- a/tests/auto/declarative/visual/animation/easing/data/easing.1.png
+++ b/tests/auto/declarative/qmlvisual/animation/easing/data/easing.1.png
diff --git a/tests/auto/declarative/visual/animation/easing/data/easing.2.png b/tests/auto/declarative/qmlvisual/animation/easing/data/easing.2.png
index 7f83548..7f83548 100644
--- a/tests/auto/declarative/visual/animation/easing/data/easing.2.png
+++ b/tests/auto/declarative/qmlvisual/animation/easing/data/easing.2.png
diff --git a/tests/auto/declarative/visual/animation/easing/data/easing.3.png b/tests/auto/declarative/qmlvisual/animation/easing/data/easing.3.png
index c68e0fa..c68e0fa 100644
--- a/tests/auto/declarative/visual/animation/easing/data/easing.3.png
+++ b/tests/auto/declarative/qmlvisual/animation/easing/data/easing.3.png
diff --git a/tests/auto/declarative/visual/animation/easing/data/easing.qml b/tests/auto/declarative/qmlvisual/animation/easing/data/easing.qml
index d8e8688..d8e8688 100644
--- a/tests/auto/declarative/visual/animation/easing/data/easing.qml
+++ b/tests/auto/declarative/qmlvisual/animation/easing/data/easing.qml
diff --git a/tests/auto/declarative/visual/animation/easing/easing.qml b/tests/auto/declarative/qmlvisual/animation/easing/easing.qml
index 4248d88..4248d88 100644
--- a/tests/auto/declarative/visual/animation/easing/easing.qml
+++ b/tests/auto/declarative/qmlvisual/animation/easing/easing.qml
diff --git a/tests/auto/declarative/visual/webview/zooming/qtlogo.png b/tests/auto/declarative/qmlvisual/animation/easing/pics/qtlogo.png
index 399bd0b..399bd0b 100644
--- a/tests/auto/declarative/visual/webview/zooming/qtlogo.png
+++ b/tests/auto/declarative/qmlvisual/animation/easing/pics/qtlogo.png
diff --git a/tests/auto/declarative/visual/animation/loop/data/loop.0.png b/tests/auto/declarative/qmlvisual/animation/loop/data/loop.0.png
index f4301d3..f4301d3 100644
--- a/tests/auto/declarative/visual/animation/loop/data/loop.0.png
+++ b/tests/auto/declarative/qmlvisual/animation/loop/data/loop.0.png
diff --git a/tests/auto/declarative/visual/animation/loop/data/loop.1.png b/tests/auto/declarative/qmlvisual/animation/loop/data/loop.1.png
index ceb0e20..ceb0e20 100644
--- a/tests/auto/declarative/visual/animation/loop/data/loop.1.png
+++ b/tests/auto/declarative/qmlvisual/animation/loop/data/loop.1.png
diff --git a/tests/auto/declarative/visual/animation/loop/data/loop.2.png b/tests/auto/declarative/qmlvisual/animation/loop/data/loop.2.png
index 197c8c0..197c8c0 100644
--- a/tests/auto/declarative/visual/animation/loop/data/loop.2.png
+++ b/tests/auto/declarative/qmlvisual/animation/loop/data/loop.2.png
diff --git a/tests/auto/declarative/visual/animation/loop/data/loop.3.png b/tests/auto/declarative/qmlvisual/animation/loop/data/loop.3.png
index 3a4327e..3a4327e 100644
--- a/tests/auto/declarative/visual/animation/loop/data/loop.3.png
+++ b/tests/auto/declarative/qmlvisual/animation/loop/data/loop.3.png
diff --git a/tests/auto/declarative/visual/animation/loop/data/loop.4.png b/tests/auto/declarative/qmlvisual/animation/loop/data/loop.4.png
index 2397719..2397719 100644
--- a/tests/auto/declarative/visual/animation/loop/data/loop.4.png
+++ b/tests/auto/declarative/qmlvisual/animation/loop/data/loop.4.png
diff --git a/tests/auto/declarative/visual/animation/loop/data/loop.5.png b/tests/auto/declarative/qmlvisual/animation/loop/data/loop.5.png
index 70d91a2..70d91a2 100644
--- a/tests/auto/declarative/visual/animation/loop/data/loop.5.png
+++ b/tests/auto/declarative/qmlvisual/animation/loop/data/loop.5.png
diff --git a/tests/auto/declarative/visual/animation/loop/data/loop.qml b/tests/auto/declarative/qmlvisual/animation/loop/data/loop.qml
index 8804d44..8804d44 100644
--- a/tests/auto/declarative/visual/animation/loop/data/loop.qml
+++ b/tests/auto/declarative/qmlvisual/animation/loop/data/loop.qml
diff --git a/tests/auto/declarative/visual/animation/loop/loop.qml b/tests/auto/declarative/qmlvisual/animation/loop/loop.qml
index 927e103..5389b26 100644
--- a/tests/auto/declarative/visual/animation/loop/loop.qml
+++ b/tests/auto/declarative/qmlvisual/animation/loop/loop.qml
@@ -13,7 +13,7 @@ Rectangle {
            to 100, jumps to 200, animates smoothly to 400, animates smoothly
            back to 100, jumps to 200, and so on.
         */
-        x: SequentialAnimation {
+        SequentialAnimation on x {
             loops: Animation.Infinite
             NumberAnimation { to: 100; duration: 1000 }
             NumberAnimation { from: 200; to: 400; duration: 1000 }
diff --git a/tests/auto/declarative/visual/animation/parallelAnimation/data/parallelAnimation.0.png b/tests/auto/declarative/qmlvisual/animation/parallelAnimation/data/parallelAnimation.0.png
index 82c18d7..82c18d7 100644
--- a/tests/auto/declarative/visual/animation/parallelAnimation/data/parallelAnimation.0.png
+++ b/tests/auto/declarative/qmlvisual/animation/parallelAnimation/data/parallelAnimation.0.png
diff --git a/tests/auto/declarative/visual/animation/parallelAnimation/data/parallelAnimation.1.png b/tests/auto/declarative/qmlvisual/animation/parallelAnimation/data/parallelAnimation.1.png
index b9a3b89..b9a3b89 100644
--- a/tests/auto/declarative/visual/animation/parallelAnimation/data/parallelAnimation.1.png
+++ b/tests/auto/declarative/qmlvisual/animation/parallelAnimation/data/parallelAnimation.1.png
diff --git a/tests/auto/declarative/visual/animation/parallelAnimation/data/parallelAnimation.2.png b/tests/auto/declarative/qmlvisual/animation/parallelAnimation/data/parallelAnimation.2.png
index 789615b..789615b 100644
--- a/tests/auto/declarative/visual/animation/parallelAnimation/data/parallelAnimation.2.png
+++ b/tests/auto/declarative/qmlvisual/animation/parallelAnimation/data/parallelAnimation.2.png
diff --git a/tests/auto/declarative/visual/animation/parallelAnimation/data/parallelAnimation.qml b/tests/auto/declarative/qmlvisual/animation/parallelAnimation/data/parallelAnimation.qml
index 5f5b8fc..5f5b8fc 100644
--- a/tests/auto/declarative/visual/animation/parallelAnimation/data/parallelAnimation.qml
+++ b/tests/auto/declarative/qmlvisual/animation/parallelAnimation/data/parallelAnimation.qml
diff --git a/tests/auto/declarative/visual/animation/parallelAnimation/parallelAnimation.qml b/tests/auto/declarative/qmlvisual/animation/parallelAnimation/parallelAnimation.qml
index 1980b91..1980b91 100644
--- a/tests/auto/declarative/visual/animation/parallelAnimation/parallelAnimation.qml
+++ b/tests/auto/declarative/qmlvisual/animation/parallelAnimation/parallelAnimation.qml
diff --git a/tests/auto/declarative/visual/animation/parentAnimation/data/parentAnimation.qml b/tests/auto/declarative/qmlvisual/animation/parentAnimation/data/parentAnimation-visual.qml
index 5718560..5718560 100644
--- a/tests/auto/declarative/visual/animation/parentAnimation/data/parentAnimation.qml
+++ b/tests/auto/declarative/qmlvisual/animation/parentAnimation/data/parentAnimation-visual.qml
diff --git a/tests/auto/declarative/visual/animation/parentAnimation/data/parentAnimation.0.png b/tests/auto/declarative/qmlvisual/animation/parentAnimation/data/parentAnimation.0.png
index 7d41abc..7d41abc 100644
--- a/tests/auto/declarative/visual/animation/parentAnimation/data/parentAnimation.0.png
+++ b/tests/auto/declarative/qmlvisual/animation/parentAnimation/data/parentAnimation.0.png
diff --git a/tests/auto/declarative/visual/animation/parentAnimation/data/parentAnimation.1.png b/tests/auto/declarative/qmlvisual/animation/parentAnimation/data/parentAnimation.1.png
index 16b95ab..16b95ab 100644
--- a/tests/auto/declarative/visual/animation/parentAnimation/data/parentAnimation.1.png
+++ b/tests/auto/declarative/qmlvisual/animation/parentAnimation/data/parentAnimation.1.png
diff --git a/tests/auto/declarative/visual/animation/parentAnimation/data/parentAnimation.2.png b/tests/auto/declarative/qmlvisual/animation/parentAnimation/data/parentAnimation.2.png
index 7d41abc..7d41abc 100644
--- a/tests/auto/declarative/visual/animation/parentAnimation/data/parentAnimation.2.png
+++ b/tests/auto/declarative/qmlvisual/animation/parentAnimation/data/parentAnimation.2.png
diff --git a/tests/auto/declarative/visual/animation/parentAnimation/data/parentAnimation.3.png b/tests/auto/declarative/qmlvisual/animation/parentAnimation/data/parentAnimation.3.png
index 800bf12..800bf12 100644
--- a/tests/auto/declarative/visual/animation/parentAnimation/data/parentAnimation.3.png
+++ b/tests/auto/declarative/qmlvisual/animation/parentAnimation/data/parentAnimation.3.png
diff --git a/tests/auto/declarative/visual/animation/parentAnimation/data/parentAnimation.4.png b/tests/auto/declarative/qmlvisual/animation/parentAnimation/data/parentAnimation.4.png
index d0155bb..d0155bb 100644
--- a/tests/auto/declarative/visual/animation/parentAnimation/data/parentAnimation.4.png
+++ b/tests/auto/declarative/qmlvisual/animation/parentAnimation/data/parentAnimation.4.png
diff --git a/tests/auto/declarative/visual/animation/parentAnimation/data/parentAnimation.5.png b/tests/auto/declarative/qmlvisual/animation/parentAnimation/data/parentAnimation.5.png
index 7d41abc..7d41abc 100644
--- a/tests/auto/declarative/visual/animation/parentAnimation/data/parentAnimation.5.png
+++ b/tests/auto/declarative/qmlvisual/animation/parentAnimation/data/parentAnimation.5.png
diff --git a/tests/auto/declarative/visual/animation/parentAnimation/parentAnimation.qml b/tests/auto/declarative/qmlvisual/animation/parentAnimation/parentAnimation-visual.qml
index 5db2cc6..8d0b375 100644
--- a/tests/auto/declarative/visual/animation/parentAnimation/parentAnimation.qml
+++ b/tests/auto/declarative/qmlvisual/animation/parentAnimation/parentAnimation-visual.qml
@@ -1,4 +1,14 @@
 import Qt 4.6
+
+/*
+This test shows a green rectangle moving and growing from the upper-left corner
+of the black rectangle to the same position as the red rectangle (it should end up
+the same height as the red rect and twice as wide). There should be no odd jumps or clipping seen.
+
+The test shows one full transition (to the red and back), then several partial transitions, and
+then a final full transition.
+*/
+
 Rectangle {
     width: 800;
     height: 480;
diff --git a/tests/auto/declarative/visual/animation/pauseAnimation/data/pauseAnimation.qml b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/data/pauseAnimation-visual.qml
index 73c6542..73c6542 100644
--- a/tests/auto/declarative/visual/animation/pauseAnimation/data/pauseAnimation.qml
+++ b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/data/pauseAnimation-visual.qml
diff --git a/tests/auto/declarative/visual/animation/pauseAnimation/data/pauseAnimation.0.png b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/data/pauseAnimation.0.png
index 693a794..693a794 100644
--- a/tests/auto/declarative/visual/animation/pauseAnimation/data/pauseAnimation.0.png
+++ b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/data/pauseAnimation.0.png
diff --git a/tests/auto/declarative/visual/animation/pauseAnimation/data/pauseAnimation.1.png b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/data/pauseAnimation.1.png
index 06d43f1..06d43f1 100644
--- a/tests/auto/declarative/visual/animation/pauseAnimation/data/pauseAnimation.1.png
+++ b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/data/pauseAnimation.1.png
diff --git a/tests/auto/declarative/visual/animation/pauseAnimation/data/pauseAnimation.2.png b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/data/pauseAnimation.2.png
index e619baf..e619baf 100644
--- a/tests/auto/declarative/visual/animation/pauseAnimation/data/pauseAnimation.2.png
+++ b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/data/pauseAnimation.2.png
diff --git a/tests/auto/declarative/visual/animation/pauseAnimation/data/pauseAnimation.3.png b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/data/pauseAnimation.3.png
index 30c7671..30c7671 100644
--- a/tests/auto/declarative/visual/animation/pauseAnimation/data/pauseAnimation.3.png
+++ b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/data/pauseAnimation.3.png
diff --git a/tests/auto/declarative/visual/animation/pauseAnimation/data/pauseAnimation.4.png b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/data/pauseAnimation.4.png
index 132803c..132803c 100644
--- a/tests/auto/declarative/visual/animation/pauseAnimation/data/pauseAnimation.4.png
+++ b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/data/pauseAnimation.4.png
diff --git a/tests/auto/declarative/visual/animation/pauseAnimation/data/pauseAnimation.5.png b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/data/pauseAnimation.5.png
index 8372bc3..8372bc3 100644
--- a/tests/auto/declarative/visual/animation/pauseAnimation/data/pauseAnimation.5.png
+++ b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/data/pauseAnimation.5.png
diff --git a/tests/auto/declarative/visual/animation/pauseAnimation/pauseAnimation.qml b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation-visual.qml
index 4562aa7..8830170 100644
--- a/tests/auto/declarative/visual/animation/pauseAnimation/pauseAnimation.qml
+++ b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation-visual.qml
@@ -1,5 +1,12 @@
 import Qt 4.6
 
+/*
+This test shows a bouncing logo.
+When the test starts the logo should be resting at the bottom. It should immediately move
+to the top, and then fall down to bounce at the bottom. There should be a pause, and then
+one repeat of the sequence.
+*/
+
 Rectangle {
     id: rect
     width: 120
@@ -9,15 +16,15 @@ Rectangle {
         id: img
         source: "pics/qtlogo.png"
         x: 60-width/2
-        y: 200-height
-        y: SequentialAnimation {
+        y: 100
+        SequentialAnimation on y {
             loops: Animation.Infinite
             NumberAnimation {
                 to: 0; duration: 500
                 easing.type: "InOutQuad"
             }
             NumberAnimation {
-                to: 200-img.height
+                to: 100
                 easing.type: "OutBounce"
                 duration: 2000
             }
diff --git a/tests/auto/declarative/visual/webview/settings/qtlogo.png b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/pics/qtlogo.png
index 399bd0b..399bd0b 100644
--- a/tests/auto/declarative/visual/webview/settings/qtlogo.png
+++ b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/pics/qtlogo.png
diff --git a/tests/auto/declarative/visual/animation/propertyAction/data/propertyAction.0.png b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.0.png
index 64d6b06..64d6b06 100644
--- a/tests/auto/declarative/visual/animation/propertyAction/data/propertyAction.0.png
+++ b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.0.png
diff --git a/tests/auto/declarative/visual/animation/propertyAction/data/propertyAction.1.png b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.1.png
index f7fce15..f7fce15 100644
--- a/tests/auto/declarative/visual/animation/propertyAction/data/propertyAction.1.png
+++ b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.1.png
diff --git a/tests/auto/declarative/visual/animation/propertyAction/data/propertyAction.2.png b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.2.png
index 3080df5..3080df5 100644
--- a/tests/auto/declarative/visual/animation/propertyAction/data/propertyAction.2.png
+++ b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.2.png
diff --git a/tests/auto/declarative/visual/animation/propertyAction/data/propertyAction.qml b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.qml
index 7c8c233..7c8c233 100644
--- a/tests/auto/declarative/visual/animation/propertyAction/data/propertyAction.qml
+++ b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.qml
diff --git a/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml b/tests/auto/declarative/qmlvisual/animation/propertyAction/propertyAction.qml
index e18e770..e18e770 100644
--- a/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml
+++ b/tests/auto/declarative/qmlvisual/animation/propertyAction/propertyAction.qml
diff --git a/tests/auto/declarative/visual/animation/reanchor/data/reanchor.0.png b/tests/auto/declarative/qmlvisual/animation/reanchor/data/reanchor.0.png
index 454f6c1..454f6c1 100644
--- a/tests/auto/declarative/visual/animation/reanchor/data/reanchor.0.png
+++ b/tests/auto/declarative/qmlvisual/animation/reanchor/data/reanchor.0.png
diff --git a/tests/auto/declarative/visual/animation/reanchor/data/reanchor.1.png b/tests/auto/declarative/qmlvisual/animation/reanchor/data/reanchor.1.png
index 9dde537..9dde537 100644
--- a/tests/auto/declarative/visual/animation/reanchor/data/reanchor.1.png
+++ b/tests/auto/declarative/qmlvisual/animation/reanchor/data/reanchor.1.png
diff --git a/tests/auto/declarative/visual/animation/reanchor/data/reanchor.2.png b/tests/auto/declarative/qmlvisual/animation/reanchor/data/reanchor.2.png
index 454f6c1..454f6c1 100644
--- a/tests/auto/declarative/visual/animation/reanchor/data/reanchor.2.png
+++ b/tests/auto/declarative/qmlvisual/animation/reanchor/data/reanchor.2.png
diff --git a/tests/auto/declarative/visual/animation/reanchor/data/reanchor.3.png b/tests/auto/declarative/qmlvisual/animation/reanchor/data/reanchor.3.png
index 454f6c1..454f6c1 100644
--- a/tests/auto/declarative/visual/animation/reanchor/data/reanchor.3.png
+++ b/tests/auto/declarative/qmlvisual/animation/reanchor/data/reanchor.3.png
diff --git a/tests/auto/declarative/visual/animation/reanchor/data/reanchor.4.png b/tests/auto/declarative/qmlvisual/animation/reanchor/data/reanchor.4.png
index 043b487..043b487 100644
--- a/tests/auto/declarative/visual/animation/reanchor/data/reanchor.4.png
+++ b/tests/auto/declarative/qmlvisual/animation/reanchor/data/reanchor.4.png
diff --git a/tests/auto/declarative/visual/animation/reanchor/data/reanchor.5.png b/tests/auto/declarative/qmlvisual/animation/reanchor/data/reanchor.5.png
index 79c791d..79c791d 100644
--- a/tests/auto/declarative/visual/animation/reanchor/data/reanchor.5.png
+++ b/tests/auto/declarative/qmlvisual/animation/reanchor/data/reanchor.5.png
diff --git a/tests/auto/declarative/visual/animation/reanchor/data/reanchor.6.png b/tests/auto/declarative/qmlvisual/animation/reanchor/data/reanchor.6.png
index 454f6c1..454f6c1 100644
--- a/tests/auto/declarative/visual/animation/reanchor/data/reanchor.6.png
+++ b/tests/auto/declarative/qmlvisual/animation/reanchor/data/reanchor.6.png
diff --git a/tests/auto/declarative/visual/animation/reanchor/data/reanchor.7.png b/tests/auto/declarative/qmlvisual/animation/reanchor/data/reanchor.7.png
index 454f6c1..454f6c1 100644
--- a/tests/auto/declarative/visual/animation/reanchor/data/reanchor.7.png
+++ b/tests/auto/declarative/qmlvisual/animation/reanchor/data/reanchor.7.png
diff --git a/tests/auto/declarative/visual/animation/reanchor/data/reanchor.8.png b/tests/auto/declarative/qmlvisual/animation/reanchor/data/reanchor.8.png
index a7d6674..a7d6674 100644
--- a/tests/auto/declarative/visual/animation/reanchor/data/reanchor.8.png
+++ b/tests/auto/declarative/qmlvisual/animation/reanchor/data/reanchor.8.png
diff --git a/tests/auto/declarative/visual/animation/reanchor/data/reanchor.qml b/tests/auto/declarative/qmlvisual/animation/reanchor/data/reanchor.qml
index a130b75..a130b75 100644
--- a/tests/auto/declarative/visual/animation/reanchor/data/reanchor.qml
+++ b/tests/auto/declarative/qmlvisual/animation/reanchor/data/reanchor.qml
diff --git a/tests/auto/declarative/visual/animation/reanchor/reanchor.qml b/tests/auto/declarative/qmlvisual/animation/reanchor/reanchor.qml
index e41a254..1d0495e 100644
--- a/tests/auto/declarative/visual/animation/reanchor/reanchor.qml
+++ b/tests/auto/declarative/qmlvisual/animation/reanchor/reanchor.qml
@@ -36,18 +36,19 @@ Rectangle {
         name: "reanchored"
         AnchorChanges {
             target: myRect;
-            left: leftGuideline.left
-            right: container.right
-            top: container.top
-            bottom: bottomGuideline.bottom
+            anchors.left: leftGuideline.left
+            anchors.right: container.right
+            anchors.top: container.top
+            anchors.bottom: bottomGuideline.bottom
         }
     }, State {
         name: "reanchored2"
         AnchorChanges {
             target: myRect;
-            reset: "left, right"
-            top: topGuideline2.top
-            bottom: bottomGuideline2.bottom
+            anchors.left: undefined
+            anchors.right: undefined
+            anchors.top: topGuideline2.top
+            anchors.bottom: bottomGuideline2.bottom
         }
     }]
 
diff --git a/tests/auto/declarative/visual/animation/scriptAction/data/scriptAction.0.png b/tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction.0.png
index 64d6b06..64d6b06 100644
--- a/tests/auto/declarative/visual/animation/scriptAction/data/scriptAction.0.png
+++ b/tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction.0.png
diff --git a/tests/auto/declarative/visual/animation/scriptAction/data/scriptAction.1.png b/tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction.1.png
index 1a25c63..1a25c63 100644
--- a/tests/auto/declarative/visual/animation/scriptAction/data/scriptAction.1.png
+++ b/tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction.1.png
diff --git a/tests/auto/declarative/visual/animation/scriptAction/data/scriptAction.qml b/tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction.qml
index 01da490..01da490 100644
--- a/tests/auto/declarative/visual/animation/scriptAction/data/scriptAction.qml
+++ b/tests/auto/declarative/qmlvisual/animation/scriptAction/data/scriptAction.qml
diff --git a/tests/auto/declarative/visual/animation/scriptAction/scriptAction.qml b/tests/auto/declarative/qmlvisual/animation/scriptAction/scriptAction.qml
index fc9ccc8..fc9ccc8 100644
--- a/tests/auto/declarative/visual/animation/scriptAction/scriptAction.qml
+++ b/tests/auto/declarative/qmlvisual/animation/scriptAction/scriptAction.qml
diff --git a/tests/auto/declarative/visual/fillmode/data/fillmode.0.png b/tests/auto/declarative/qmlvisual/fillmode/data/fillmode.0.png
index 9c9ceae..9c9ceae 100644
--- a/tests/auto/declarative/visual/fillmode/data/fillmode.0.png
+++ b/tests/auto/declarative/qmlvisual/fillmode/data/fillmode.0.png
diff --git a/tests/auto/declarative/visual/fillmode/data/fillmode.qml b/tests/auto/declarative/qmlvisual/fillmode/data/fillmode.qml
index 7ac6f51..7ac6f51 100644
--- a/tests/auto/declarative/visual/fillmode/data/fillmode.qml
+++ b/tests/auto/declarative/qmlvisual/fillmode/data/fillmode.qml
diff --git a/tests/auto/declarative/visual/fillmode/face.png b/tests/auto/declarative/qmlvisual/fillmode/face.png
index 9623b1a..9623b1a 100644
--- a/tests/auto/declarative/visual/fillmode/face.png
+++ b/tests/auto/declarative/qmlvisual/fillmode/face.png
diff --git a/tests/auto/declarative/visual/fillmode/fillmode.qml b/tests/auto/declarative/qmlvisual/fillmode/fillmode.qml
index 8450bf2..8450bf2 100644
--- a/tests/auto/declarative/visual/fillmode/fillmode.qml
+++ b/tests/auto/declarative/qmlvisual/fillmode/fillmode.qml
diff --git a/tests/auto/declarative/visual/focusscope/data-MAC/test.0.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.0.png
index 0f33d99..0f33d99 100644
--- a/tests/auto/declarative/visual/focusscope/data-MAC/test.0.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.0.png
diff --git a/tests/auto/declarative/visual/focusscope/data-MAC/test.1.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.1.png
index 0f33d99..0f33d99 100644
--- a/tests/auto/declarative/visual/focusscope/data-MAC/test.1.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.1.png
diff --git a/tests/auto/declarative/visual/focusscope/data-MAC/test.2.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.2.png
index 06a3dbd..06a3dbd 100644
--- a/tests/auto/declarative/visual/focusscope/data-MAC/test.2.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.2.png
diff --git a/tests/auto/declarative/visual/focusscope/data-MAC/test.3.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.3.png
index e0d02d6..e0d02d6 100644
--- a/tests/auto/declarative/visual/focusscope/data-MAC/test.3.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.3.png
diff --git a/tests/auto/declarative/visual/focusscope/data-MAC/test.4.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.4.png
index e0d02d6..e0d02d6 100644
--- a/tests/auto/declarative/visual/focusscope/data-MAC/test.4.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.4.png
diff --git a/tests/auto/declarative/visual/focusscope/data-MAC/test.5.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.5.png
index e0d02d6..e0d02d6 100644
--- a/tests/auto/declarative/visual/focusscope/data-MAC/test.5.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.5.png
diff --git a/tests/auto/declarative/visual/focusscope/data-MAC/test.qml b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.qml
index 44900fc..44900fc 100644
--- a/tests/auto/declarative/visual/focusscope/data-MAC/test.qml
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test.qml
diff --git a/tests/auto/declarative/visual/focusscope/data-MAC/test2.0.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test2.0.png
index fa711c1..fa711c1 100644
--- a/tests/auto/declarative/visual/focusscope/data-MAC/test2.0.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test2.0.png
diff --git a/tests/auto/declarative/visual/focusscope/data-MAC/test2.1.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test2.1.png
index fa711c1..fa711c1 100644
--- a/tests/auto/declarative/visual/focusscope/data-MAC/test2.1.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test2.1.png
diff --git a/tests/auto/declarative/visual/focusscope/data-MAC/test2.qml b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test2.qml
index 7837ad9..7837ad9 100644
--- a/tests/auto/declarative/visual/focusscope/data-MAC/test2.qml
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test2.qml
diff --git a/tests/auto/declarative/visual/focusscope/data-MAC/test3.0.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.0.png
index 9309e37..9309e37 100644
--- a/tests/auto/declarative/visual/focusscope/data-MAC/test3.0.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.0.png
diff --git a/tests/auto/declarative/visual/focusscope/data-MAC/test3.1.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.1.png
index 20e6c8e..20e6c8e 100644
--- a/tests/auto/declarative/visual/focusscope/data-MAC/test3.1.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.1.png
diff --git a/tests/auto/declarative/visual/focusscope/data-MAC/test3.2.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.2.png
index c7559ac..c7559ac 100644
--- a/tests/auto/declarative/visual/focusscope/data-MAC/test3.2.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.2.png
diff --git a/tests/auto/declarative/visual/focusscope/data-MAC/test3.3.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.3.png
index bf2844b..bf2844b 100644
--- a/tests/auto/declarative/visual/focusscope/data-MAC/test3.3.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.3.png
diff --git a/tests/auto/declarative/visual/focusscope/data-MAC/test3.4.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.4.png
index beef0bf..beef0bf 100644
--- a/tests/auto/declarative/visual/focusscope/data-MAC/test3.4.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.4.png
diff --git a/tests/auto/declarative/visual/focusscope/data-MAC/test3.5.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.5.png
index 1847dc7..1847dc7 100644
--- a/tests/auto/declarative/visual/focusscope/data-MAC/test3.5.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.5.png
diff --git a/tests/auto/declarative/visual/focusscope/data-MAC/test3.6.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.6.png
index c7559ac..c7559ac 100644
--- a/tests/auto/declarative/visual/focusscope/data-MAC/test3.6.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.6.png
diff --git a/tests/auto/declarative/visual/focusscope/data-MAC/test3.7.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.7.png
index 20e6c8e..20e6c8e 100644
--- a/tests/auto/declarative/visual/focusscope/data-MAC/test3.7.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.7.png
diff --git a/tests/auto/declarative/visual/focusscope/data-MAC/test3.8.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.8.png
index 9309e37..9309e37 100644
--- a/tests/auto/declarative/visual/focusscope/data-MAC/test3.8.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.8.png
diff --git a/tests/auto/declarative/visual/focusscope/data-MAC/test3.9.png b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.9.png
index 7ac879b..7ac879b 100644
--- a/tests/auto/declarative/visual/focusscope/data-MAC/test3.9.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.9.png
diff --git a/tests/auto/declarative/visual/focusscope/data-MAC/test3.qml b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.qml
index 7308a23..7308a23 100644
--- a/tests/auto/declarative/visual/focusscope/data-MAC/test3.qml
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-MAC/test3.qml
diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test.0.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.0.png
index f68f7dc..f68f7dc 100644
--- a/tests/auto/declarative/visual/focusscope/data-X11/test.0.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.0.png
diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test.1.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.1.png
index f68f7dc..f68f7dc 100644
--- a/tests/auto/declarative/visual/focusscope/data-X11/test.1.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.1.png
diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test.2.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.2.png
index e26c028..e26c028 100644
--- a/tests/auto/declarative/visual/focusscope/data-X11/test.2.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.2.png
diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test.3.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.3.png
index 9c4b2f2..9c4b2f2 100644
--- a/tests/auto/declarative/visual/focusscope/data-X11/test.3.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.3.png
diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test.4.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.4.png
index 9c4b2f2..9c4b2f2 100644
--- a/tests/auto/declarative/visual/focusscope/data-X11/test.4.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.4.png
diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test.5.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.5.png
index 9c4b2f2..9c4b2f2 100644
--- a/tests/auto/declarative/visual/focusscope/data-X11/test.5.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.5.png
diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test.qml b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.qml
index 93189fa..93189fa 100644
--- a/tests/auto/declarative/visual/focusscope/data-X11/test.qml
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test.qml
diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test2.0.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test2.0.png
index 6be7aef..6be7aef 100644
--- a/tests/auto/declarative/visual/focusscope/data-X11/test2.0.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test2.0.png
diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test2.1.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test2.1.png
index 6be7aef..6be7aef 100644
--- a/tests/auto/declarative/visual/focusscope/data-X11/test2.1.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test2.1.png
diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test2.qml b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test2.qml
index 7170907..7170907 100644
--- a/tests/auto/declarative/visual/focusscope/data-X11/test2.qml
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test2.qml
diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test3.0.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.0.png
index 5f93c67..5f93c67 100644
--- a/tests/auto/declarative/visual/focusscope/data-X11/test3.0.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.0.png
diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test3.1.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.1.png
index 3b4e0e6..3b4e0e6 100644
--- a/tests/auto/declarative/visual/focusscope/data-X11/test3.1.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.1.png
diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test3.2.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.2.png
index 54a3934..54a3934 100644
--- a/tests/auto/declarative/visual/focusscope/data-X11/test3.2.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.2.png
diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test3.3.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.3.png
index 4f08fd2..4f08fd2 100644
--- a/tests/auto/declarative/visual/focusscope/data-X11/test3.3.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.3.png
diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test3.4.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.4.png
index 9aee1f8..9aee1f8 100644
--- a/tests/auto/declarative/visual/focusscope/data-X11/test3.4.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.4.png
diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test3.5.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.5.png
index 04eb05c..04eb05c 100644
--- a/tests/auto/declarative/visual/focusscope/data-X11/test3.5.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.5.png
diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test3.6.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.6.png
index 54a3934..54a3934 100644
--- a/tests/auto/declarative/visual/focusscope/data-X11/test3.6.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.6.png
diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test3.7.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.7.png
index 3b4e0e6..3b4e0e6 100644
--- a/tests/auto/declarative/visual/focusscope/data-X11/test3.7.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.7.png
diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test3.8.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.8.png
index 2df55df..2df55df 100644
--- a/tests/auto/declarative/visual/focusscope/data-X11/test3.8.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.8.png
diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test3.9.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.9.png
index 91816fd..91816fd 100644
--- a/tests/auto/declarative/visual/focusscope/data-X11/test3.9.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.9.png
diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test3.qml b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.qml
index b1f628f..b1f628f 100644
--- a/tests/auto/declarative/visual/focusscope/data-X11/test3.qml
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.qml
diff --git a/tests/auto/declarative/visual/focusscope/data/test.0.png b/tests/auto/declarative/qmlvisual/focusscope/data/test.0.png
index 67b99e0..67b99e0 100644
--- a/tests/auto/declarative/visual/focusscope/data/test.0.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data/test.0.png
diff --git a/tests/auto/declarative/visual/focusscope/data/test.1.png b/tests/auto/declarative/qmlvisual/focusscope/data/test.1.png
index 67b99e0..67b99e0 100644
--- a/tests/auto/declarative/visual/focusscope/data/test.1.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data/test.1.png
diff --git a/tests/auto/declarative/visual/focusscope/data/test.2.png b/tests/auto/declarative/qmlvisual/focusscope/data/test.2.png
index 69f0366..69f0366 100644
--- a/tests/auto/declarative/visual/focusscope/data/test.2.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data/test.2.png
diff --git a/tests/auto/declarative/visual/focusscope/data/test.3.png b/tests/auto/declarative/qmlvisual/focusscope/data/test.3.png
index afe0bd9..afe0bd9 100644
--- a/tests/auto/declarative/visual/focusscope/data/test.3.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data/test.3.png
diff --git a/tests/auto/declarative/visual/focusscope/data/test.4.png b/tests/auto/declarative/qmlvisual/focusscope/data/test.4.png
index afe0bd9..afe0bd9 100644
--- a/tests/auto/declarative/visual/focusscope/data/test.4.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data/test.4.png
diff --git a/tests/auto/declarative/visual/focusscope/data/test.5.png b/tests/auto/declarative/qmlvisual/focusscope/data/test.5.png
index afe0bd9..afe0bd9 100644
--- a/tests/auto/declarative/visual/focusscope/data/test.5.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data/test.5.png
diff --git a/tests/auto/declarative/visual/focusscope/data/test.qml b/tests/auto/declarative/qmlvisual/focusscope/data/test.qml
index d86c034..d86c034 100644
--- a/tests/auto/declarative/visual/focusscope/data/test.qml
+++ b/tests/auto/declarative/qmlvisual/focusscope/data/test.qml
diff --git a/tests/auto/declarative/visual/focusscope/data/test2.0.png b/tests/auto/declarative/qmlvisual/focusscope/data/test2.0.png
index 555a968..555a968 100644
--- a/tests/auto/declarative/visual/focusscope/data/test2.0.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data/test2.0.png
diff --git a/tests/auto/declarative/visual/focusscope/data/test2.1.png b/tests/auto/declarative/qmlvisual/focusscope/data/test2.1.png
index 555a968..555a968 100644
--- a/tests/auto/declarative/visual/focusscope/data/test2.1.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data/test2.1.png
diff --git a/tests/auto/declarative/visual/focusscope/data/test2.qml b/tests/auto/declarative/qmlvisual/focusscope/data/test2.qml
index fedc96a..fedc96a 100644
--- a/tests/auto/declarative/visual/focusscope/data/test2.qml
+++ b/tests/auto/declarative/qmlvisual/focusscope/data/test2.qml
diff --git a/tests/auto/declarative/visual/focusscope/data/test3.0.png b/tests/auto/declarative/qmlvisual/focusscope/data/test3.0.png
index 374acf5..374acf5 100644
--- a/tests/auto/declarative/visual/focusscope/data/test3.0.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data/test3.0.png
diff --git a/tests/auto/declarative/visual/focusscope/data/test3.1.png b/tests/auto/declarative/qmlvisual/focusscope/data/test3.1.png
index b75cb10..b75cb10 100644
--- a/tests/auto/declarative/visual/focusscope/data/test3.1.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data/test3.1.png
diff --git a/tests/auto/declarative/visual/focusscope/data/test3.2.png b/tests/auto/declarative/qmlvisual/focusscope/data/test3.2.png
index 9b2f919..9b2f919 100644
--- a/tests/auto/declarative/visual/focusscope/data/test3.2.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data/test3.2.png
diff --git a/tests/auto/declarative/visual/focusscope/data/test3.3.png b/tests/auto/declarative/qmlvisual/focusscope/data/test3.3.png
index bf63032..bf63032 100644
--- a/tests/auto/declarative/visual/focusscope/data/test3.3.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data/test3.3.png
diff --git a/tests/auto/declarative/visual/focusscope/data/test3.4.png b/tests/auto/declarative/qmlvisual/focusscope/data/test3.4.png
index 6981a06..6981a06 100644
--- a/tests/auto/declarative/visual/focusscope/data/test3.4.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data/test3.4.png
diff --git a/tests/auto/declarative/visual/focusscope/data/test3.5.png b/tests/auto/declarative/qmlvisual/focusscope/data/test3.5.png
index 5856325..5856325 100644
--- a/tests/auto/declarative/visual/focusscope/data/test3.5.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data/test3.5.png
diff --git a/tests/auto/declarative/visual/focusscope/data/test3.6.png b/tests/auto/declarative/qmlvisual/focusscope/data/test3.6.png
index 9b2f919..9b2f919 100644
--- a/tests/auto/declarative/visual/focusscope/data/test3.6.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data/test3.6.png
diff --git a/tests/auto/declarative/visual/focusscope/data/test3.7.png b/tests/auto/declarative/qmlvisual/focusscope/data/test3.7.png
index b75cb10..b75cb10 100644
--- a/tests/auto/declarative/visual/focusscope/data/test3.7.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data/test3.7.png
diff --git a/tests/auto/declarative/visual/focusscope/data/test3.8.png b/tests/auto/declarative/qmlvisual/focusscope/data/test3.8.png
index 374acf5..374acf5 100644
--- a/tests/auto/declarative/visual/focusscope/data/test3.8.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data/test3.8.png
diff --git a/tests/auto/declarative/visual/focusscope/data/test3.9.png b/tests/auto/declarative/qmlvisual/focusscope/data/test3.9.png
index 11a08bd..11a08bd 100644
--- a/tests/auto/declarative/visual/focusscope/data/test3.9.png
+++ b/tests/auto/declarative/qmlvisual/focusscope/data/test3.9.png
diff --git a/tests/auto/declarative/visual/focusscope/data/test3.qml b/tests/auto/declarative/qmlvisual/focusscope/data/test3.qml
index 8ce7944..8ce7944 100644
--- a/tests/auto/declarative/visual/focusscope/data/test3.qml
+++ b/tests/auto/declarative/qmlvisual/focusscope/data/test3.qml
diff --git a/tests/auto/declarative/visual/focusscope/test.qml b/tests/auto/declarative/qmlvisual/focusscope/test.qml
index 401c7dc..401c7dc 100644
--- a/tests/auto/declarative/visual/focusscope/test.qml
+++ b/tests/auto/declarative/qmlvisual/focusscope/test.qml
diff --git a/tests/auto/declarative/visual/focusscope/test2.qml b/tests/auto/declarative/qmlvisual/focusscope/test2.qml
index 5b6971a..5b6971a 100644
--- a/tests/auto/declarative/visual/focusscope/test2.qml
+++ b/tests/auto/declarative/qmlvisual/focusscope/test2.qml
diff --git a/tests/auto/declarative/visual/focusscope/test3.qml b/tests/auto/declarative/qmlvisual/focusscope/test3.qml
index 855bdc5..a8bb523 100644
--- a/tests/auto/declarative/visual/focusscope/test3.qml
+++ b/tests/auto/declarative/qmlvisual/focusscope/test3.qml
@@ -5,7 +5,7 @@ Rectangle {
     width: 800
     height: 600
 
-    Listmodel {
+    ListModel {
         id: model
         ListElement { name: "1" }
         ListElement { name: "2" }
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/animated-smooth.qml b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/animated-smooth.qml
index 0ceaf49..0ceaf49 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/animated-smooth.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/animated-smooth.qml
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/animated.qml b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/animated.qml
index 29c02b3..29c02b3 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/animated.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/animated.qml
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/borders.qml b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/borders.qml
index 9879416..9879416 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/borders.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/borders.qml
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/content/MyBorderImage.qml b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/content/MyBorderImage.qml
index c3006d5..58d03a6 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/content/MyBorderImage.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/content/MyBorderImage.qml
@@ -18,13 +18,13 @@ Item {
     BorderImage {
         id: image; x: container.width / 2 - width / 2; y: container.height / 2 - height / 2
 
-        width: SequentialAnimation {
+        SequentialAnimation on width {
             loops: Animation.Infinite
             NumberAnimation { from: container.minWidth; to: container.maxWidth; duration: 2000; easing.type: "InOutQuad"}
             NumberAnimation { from: container.maxWidth; to: container.minWidth; duration: 2000; easing.type: "InOutQuad" }
         }
 
-        height: SequentialAnimation {
+        SequentialAnimation on height {
             loops: Animation.Infinite
             NumberAnimation { from: container.minHeight; to: container.maxHeight; duration: 2000; easing.type: "InOutQuad"}
             NumberAnimation { from: container.maxHeight; to: container.minHeight; duration: 2000; easing.type: "InOutQuad" }
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/content/bw.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/content/bw.png
index 486eaae..486eaae 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/content/bw.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/content/bw.png
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/content/colors-round.sci b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/content/colors-round.sci
index 506f6f5..506f6f5 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/content/colors-round.sci
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/content/colors-round.sci
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/content/colors-stretch.sci b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/content/colors-stretch.sci
index e4989a7..e4989a7 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/content/colors-stretch.sci
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/content/colors-stretch.sci
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/content/colors.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/content/colors.png
index dfb62f3..dfb62f3 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/content/colors.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/content/colors.png
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.0.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.0.png
index 9a6b079..9a6b079 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.1.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.1.png
index 1f960e5..1f960e5 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.2.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.2.png
index 85a2729..85a2729 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.3.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.3.png
index de6ff7c..de6ff7c 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.4.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.4.png
index fe7d3dd..fe7d3dd 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.4.png
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.5.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.5.png
index e73bef5..e73bef5 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.5.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.5.png
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.6.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.6.png
index 0c75422..0c75422 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.6.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.6.png
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.qml b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.qml
index 043f5e2..043f5e2 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.qml
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.0.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.0.png
index 99228f9..99228f9 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.1.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.1.png
index a2dcd00..a2dcd00 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.2.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.2.png
index 8a80020..8a80020 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.3.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.3.png
index 02b57ef..02b57ef 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.4.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.4.png
index df0f6cc..df0f6cc 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.4.png
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.5.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.5.png
index 0add64d..0add64d 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.5.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.5.png
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.6.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.6.png
index 0886207..0886207 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.6.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.6.png
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.7.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.7.png
index bc1a7b0..bc1a7b0 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.7.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.7.png
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.qml b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.qml
index 29e591a..29e591a 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated.qml
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.0.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.0.png
index 80cbd26..80cbd26 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.1.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.1.png
index 80cbd26..80cbd26 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.2.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.2.png
index 80cbd26..80cbd26 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.3.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.3.png
index 80cbd26..80cbd26 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.4.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.4.png
index 80cbd26..80cbd26 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.4.png
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.qml b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.qml
index 16cd5e9..16cd5e9 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.qml
diff --git a/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.0.png b/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.0.png
index 21b6afb..21b6afb 100644
--- a/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.1.png b/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.1.png
index bb8a02b..bb8a02b 100644
--- a/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.2.png b/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.2.png
index da60237..da60237 100644
--- a/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.3.png b/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.3.png
index 3e943e8..3e943e8 100644
--- a/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.4.png b/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.4.png
index 4fbaf26..4fbaf26 100644
--- a/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.4.png
diff --git a/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.5.png b/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.5.png
index c10d196..c10d196 100644
--- a/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.5.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.5.png
diff --git a/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.6.png b/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.6.png
index a672c06..a672c06 100644
--- a/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.6.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.6.png
diff --git a/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.qml b/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.qml
index 029a2fc..029a2fc 100644
--- a/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.qml
diff --git a/tests/auto/declarative/visual/qdeclarativeeasefollow/easefollow.qml b/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/easefollow.qml
index 99a9973..121328b 100644
--- a/tests/auto/declarative/visual/qdeclarativeeasefollow/easefollow.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/easefollow.qml
@@ -6,7 +6,7 @@ Rectangle {
     Rectangle {
         id: rect
         width: 50; height: 20; y: 30; color: "black"
-        x: SequentialAnimation {
+        SequentialAnimation on x {
             loops: Animation.Infinite
             NumberAnimation { from: 50; to: 700; duration: 2000 }
             NumberAnimation { from: 700; to: 50; duration: 2000 }
@@ -15,26 +15,26 @@ Rectangle {
 
     Rectangle {
         width: 50; height: 20; y: 60; color: "red"
-        x: EaseFollow { source: rect.x; velocity: 400 }
+        EaseFollow on x { source: rect.x; velocity: 400 }
     }
 
     Rectangle {
         width: 50; height: 20; y: 90; color: "yellow"
-        x: EaseFollow { source: rect.x; velocity: 300; reversingMode: EaseFollow.Immediate }
+        EaseFollow on x { source: rect.x; velocity: 300; reversingMode: EaseFollow.Immediate }
     }
 
     Rectangle {
         width: 50; height: 20; y: 120; color: "green"
-        x: EaseFollow { source: rect.x; reversingMode: EaseFollow.Sync }
+        EaseFollow on x { source: rect.x; reversingMode: EaseFollow.Sync }
     }
 
     Rectangle {
         width: 50; height: 20; y: 150; color: "purple"
-        x: EaseFollow { source: rect.x; maximumEasingTime: 200 }
+        EaseFollow on x { source: rect.x; maximumEasingTime: 200 }
     }
 
     Rectangle {
         width: 50; height: 20; y: 180; color: "blue"
-        x: EaseFollow { source: rect.x; duration: 300 }
+        EaseFollow on x { source: rect.x; duration: 300 }
     }
 }
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.0.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.0.png
index 016902b..016902b 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.1.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.1.png
index a654936..a654936 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.2.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.2.png
index cfd5517..cfd5517 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.3.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.3.png
index 016902b..016902b 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.qml b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.qml
index 46086f9..46086f9 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.qml
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.0.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.0.png
index 18fef53..18fef53 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.1.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.1.png
index 18fef53..18fef53 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.10.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.10.png
index b352c68..b352c68 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.10.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.10.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.11.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.11.png
index ce7ee68..ce7ee68 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.11.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.11.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.12.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.12.png
index d8cdacf..d8cdacf 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.12.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.12.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.13.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.13.png
index 0c2fa7b..0c2fa7b 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.13.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.13.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.14.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.14.png
index e9b3028..e9b3028 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.14.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.14.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.15.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.15.png
index 2186a8b..2186a8b 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.15.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.15.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.16.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.16.png
index b4590af..b4590af 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.16.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.16.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.17.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.17.png
index fe29f19..fe29f19 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.17.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.17.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.18.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.18.png
index fe29f19..fe29f19 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.18.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.18.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.19.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.19.png
index 4f8587f..4f8587f 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.19.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.19.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.2.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.2.png
index 0a7cc03..0a7cc03 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.20.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.20.png
index 4f8587f..4f8587f 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.20.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.20.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.21.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.21.png
index c0b0bdf..c0b0bdf 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.21.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.21.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.22.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.22.png
index 4168c3b..4168c3b 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.22.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.22.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.23.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.23.png
index 18fef53..18fef53 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.23.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.23.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.24.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.24.png
index e69de29..e69de29 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.24.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.24.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.3.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.3.png
index fc6669d..fc6669d 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.4.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.4.png
index c0b0bdf..c0b0bdf 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.4.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.5.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.5.png
index 2ffa96e..2ffa96e 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.5.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.5.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.6.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.6.png
index f550b89..f550b89 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.6.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.6.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.7.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.7.png
index f550b89..f550b89 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.7.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.7.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.8.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.8.png
index f550b89..f550b89 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.8.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.8.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.9.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.9.png
index f550b89..f550b89 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.9.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.9.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.qml b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.qml
index db70298..db70298 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.qml
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/flickable-horizontal.qml b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/flickable-horizontal.qml
index 50ba9ad..50ba9ad 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/flickable-horizontal.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/flickable-horizontal.qml
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/flickable-vertical.qml b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/flickable-vertical.qml
index ebb963d..ebb963d 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/flickable-vertical.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/flickable-vertical.qml
diff --git a/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.0.png b/tests/auto/declarative/qmlvisual/qdeclarativeflipable/data/test-flipable.0.png
index 53a8b42..53a8b42 100644
--- a/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflipable/data/test-flipable.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.1.png b/tests/auto/declarative/qmlvisual/qdeclarativeflipable/data/test-flipable.1.png
index b7efe8c..b7efe8c 100644
--- a/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflipable/data/test-flipable.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.2.png b/tests/auto/declarative/qmlvisual/qdeclarativeflipable/data/test-flipable.2.png
index aa6d147..aa6d147 100644
--- a/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflipable/data/test-flipable.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.3.png b/tests/auto/declarative/qmlvisual/qdeclarativeflipable/data/test-flipable.3.png
index 9d39713..9d39713 100644
--- a/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflipable/data/test-flipable.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.4.png b/tests/auto/declarative/qmlvisual/qdeclarativeflipable/data/test-flipable.4.png
index 98e8817..98e8817 100644
--- a/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflipable/data/test-flipable.4.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.5.png b/tests/auto/declarative/qmlvisual/qdeclarativeflipable/data/test-flipable.5.png
index a3f9d8f..a3f9d8f 100644
--- a/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.5.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflipable/data/test-flipable.5.png
diff --git a/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.qml b/tests/auto/declarative/qmlvisual/qdeclarativeflipable/data/test-flipable.qml
index 520d9a2..520d9a2 100644
--- a/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflipable/data/test-flipable.qml
diff --git a/tests/auto/declarative/visual/qdeclarativeflipable/test-flipable.qml b/tests/auto/declarative/qmlvisual/qdeclarativeflipable/test-flipable.qml
index a27aa6e..a27aa6e 100644
--- a/tests/auto/declarative/visual/qdeclarativeflipable/test-flipable.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflipable/test-flipable.qml
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.0.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.0.png
index 6c82777..6c82777 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.1.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.1.png
index 07b1f7c..07b1f7c 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.2.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.2.png
index f2f08c0..f2f08c0 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.3.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.3.png
index 08649f9..08649f9 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.4.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.4.png
index f9c2f17..f9c2f17 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.4.png
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.5.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.5.png
index 52ec0bd..52ec0bd 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.5.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.5.png
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.6.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.6.png
index 3fe25be..3fe25be 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.6.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.6.png
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.7.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.7.png
index 4cc12a6..4cc12a6 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.7.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.7.png
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.8.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.8.png
index 2267f23..2267f23 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.8.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.8.png
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.9.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.9.png
index 6c82777..6c82777 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.9.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.9.png
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.qml b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.qml
index c7ac52d..c7ac52d 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview.qml
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.0.png
index 3021d58..3021d58 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.1.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.1.png
index baeb1a6..baeb1a6 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.10.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.10.png
index b0486e5..b0486e5 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.10.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.10.png
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.2.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.2.png
index 2d0c731..2d0c731 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.3.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.3.png
index af9ed05..af9ed05 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.4.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.4.png
index 0b0945d..0b0945d 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.4.png
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.5.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.5.png
index 618ae0c..618ae0c 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.5.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.5.png
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.6.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.6.png
index fc31262..fc31262 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.6.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.6.png
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.7.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.7.png
index 22291ac..22291ac 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.7.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.7.png
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.8.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.8.png
index 3021d58..3021d58 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.8.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.8.png
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.9.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.9.png
index 2f2f5b9..2f2f5b9 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.9.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.9.png
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.qml b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.qml
index fb5f1fb..fb5f1fb 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.qml
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/gridview.qml b/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview.qml
index f8782a5..f8782a5 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/gridview.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview.qml
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/gridview2.qml b/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml
index 81d06cf..f4fb863 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/gridview2.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml
@@ -49,8 +49,8 @@ Rectangle {
             Rectangle {
                 color: "transparent"; border.color: "white"; border.width: 8; z: 3000
                 height: 100; width: 100; x: 4; y: 4
-                x: EaseFollow { source: gridView.currentItem.x; velocity: 500 }
-                y: EaseFollow { source: gridView.currentItem.y; velocity: 500 }
+                EaseFollow on x { source: gridView.currentItem.x; velocity: 500 }
+                EaseFollow on y { source: gridView.currentItem.y; velocity: 500 }
             }
         ]
     }
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.0.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/drag.0.png
index cf36d60..cf36d60 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/drag.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.1.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/drag.1.png
index 6069df8..6069df8 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/drag.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.2.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/drag.2.png
index b8bd5f3..b8bd5f3 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/drag.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.3.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/drag.3.png
index cf36d60..cf36d60 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/drag.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.4.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/drag.4.png
index 831d6b4..831d6b4 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/drag.4.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.5.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/drag.5.png
index f7079dc..f7079dc 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.5.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/drag.5.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.6.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/drag.6.png
index a5f4451..a5f4451 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.6.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/drag.6.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.7.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/drag.7.png
index e1261d0..e1261d0 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.7.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/drag.7.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.8.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/drag.8.png
index 653905e..653905e 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.8.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/drag.8.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.qml b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/drag.qml
index 5a131e9..5a131e9 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/drag.qml
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.0.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.0.png
index c249c21..c249c21 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.1.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.1.png
index a96bf1b..a96bf1b 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.10.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.10.png
index 7420ca7..7420ca7 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.10.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.10.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.11.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.11.png
index 7420ca7..7420ca7 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.11.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.11.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.12.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.12.png
index 7420ca7..7420ca7 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.12.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.12.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.13.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.13.png
index 7420ca7..7420ca7 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.13.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.13.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.14.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.14.png
index 7420ca7..7420ca7 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.14.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.14.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.15.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.15.png
index e797cc9..e797cc9 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.15.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.15.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.16.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.16.png
index 7951309..7951309 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.16.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.16.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.17.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.17.png
index 7951309..7951309 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.17.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.17.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.18.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.18.png
index 7951309..7951309 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.18.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.18.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.19.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.19.png
index 7951309..7951309 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.19.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.19.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.2.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.2.png
index a96bf1b..a96bf1b 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.20.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.20.png
index 7951309..7951309 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.20.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.20.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.21.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.21.png
index 7951309..7951309 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.21.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.21.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.22.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.22.png
index 7951309..7951309 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.22.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.22.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.3.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.3.png
index a96bf1b..a96bf1b 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.4.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.4.png
index 1fe365a..1fe365a 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.4.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.5.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.5.png
index 1fe365a..1fe365a 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.5.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.5.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.6.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.6.png
index 1fe365a..1fe365a 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.6.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.6.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.7.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.7.png
index 1fe365a..1fe365a 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.7.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.7.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.8.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.8.png
index 7420ca7..7420ca7 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.8.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.8.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.9.png b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.9.png
index 7420ca7..7420ca7 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.9.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.9.png
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.qml b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.qml
index cc374fd..cc374fd 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/data/mouseregion.qml
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/drag.qml b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/drag.qml
index dbb2a24..dbb2a24 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/drag.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/drag.qml
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/mouseregion.qml b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/mouseregion.qml
index 3c722d0..3c722d0 100644
--- a/tests/auto/declarative/visual/qdeclarativemouseregion/mouseregion.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemouseregion/mouseregion.qml
diff --git a/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.0.png b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.0.png
index 7321d95..7321d95 100644
--- a/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.1.png b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.1.png
index 49d2a5a..49d2a5a 100644
--- a/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.2.png b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.2.png
index 6fe14b7..6fe14b7 100644
--- a/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.qml b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.qml
index d766dc6..d766dc6 100644
--- a/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.qml
diff --git a/tests/auto/declarative/visual/qdeclarativeparticles/particles.qml b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/particles.qml
index 2d481c9..2d481c9 100644
--- a/tests/auto/declarative/visual/qdeclarativeparticles/particles.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/particles.qml
diff --git a/tests/auto/declarative/visual/qdeclarativeparticles/star.png b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/star.png
index defbde5..defbde5 100644
--- a/tests/auto/declarative/visual/qdeclarativeparticles/star.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/star.png
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.0.png
index 18c8a9e..18c8a9e 100644
--- a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.1.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.1.png
index e86acb4..e86acb4 100644
--- a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.2.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.2.png
index 17990b7..17990b7 100644
--- a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.3.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.3.png
index 18c8a9e..18c8a9e 100644
--- a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.4.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.4.png
index 18c8a9e..18c8a9e 100644
--- a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.4.png
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.5.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.5.png
index 8636f8f..8636f8f 100644
--- a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.5.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.5.png
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.6.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.6.png
index fa7c4b6..fa7c4b6 100644
--- a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.6.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.6.png
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.qml b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.qml
index b8ff925..b8ff925 100644
--- a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview-2.qml
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.0.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.0.png
index 442ba9f..442ba9f 100644
--- a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.1.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.1.png
index a9ff20f..a9ff20f 100644
--- a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.2.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.2.png
index 157bb99..157bb99 100644
--- a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.3.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.3.png
index 8c49acb..8c49acb 100644
--- a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.4.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.4.png
index eb2bf54..eb2bf54 100644
--- a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.4.png
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.qml b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.qml
index 8cff5c6..8cff5c6 100644
--- a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.qml
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/test-pathview-2.qml b/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview-2.qml
index c6d71d5..c6d71d5 100644
--- a/tests/auto/declarative/visual/qdeclarativepathview/test-pathview-2.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview-2.qml
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/test-pathview.qml b/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml
index 0adfa02..0adfa02 100644
--- a/tests/auto/declarative/visual/qdeclarativepathview/test-pathview.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml
diff --git a/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.0.png b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.0.png
index f474afe..f474afe 100644
--- a/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.1.png b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.1.png
index 8b7ae74..8b7ae74 100644
--- a/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.2.png b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.2.png
index 9088bb4..9088bb4 100644
--- a/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.3.png b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.3.png
index 18cd429..18cd429 100644
--- a/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.4.png b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.4.png
index 739afc1..739afc1 100644
--- a/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.4.png
diff --git a/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.5.png b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.5.png
index 93f0682..93f0682 100644
--- a/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.5.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.5.png
diff --git a/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.qml b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.qml
index 7091bb3..7091bb3 100644
--- a/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/dynamic.qml
diff --git a/tests/auto/declarative/visual/qdeclarativepositioners/data/repeater.0.png b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/repeater.0.png
index f7018fd..f7018fd 100644
--- a/tests/auto/declarative/visual/qdeclarativepositioners/data/repeater.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/repeater.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativepositioners/data/repeater.qml b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/repeater.qml
index 1eb115d..1eb115d 100644
--- a/tests/auto/declarative/visual/qdeclarativepositioners/data/repeater.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/repeater.qml
diff --git a/tests/auto/declarative/visual/qdeclarativepositioners/dynamic.qml b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml
index f45e9a4..f45e9a4 100644
--- a/tests/auto/declarative/visual/qdeclarativepositioners/dynamic.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml
diff --git a/tests/auto/declarative/visual/qdeclarativepositioners/repeater.qml b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/repeater.qml
index ff60365..ff60365 100644
--- a/tests/auto/declarative/visual/qdeclarativepositioners/repeater.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/repeater.qml
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/clock.qml b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/clock.qml
index 04bbabc..21bbc7f 100644
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/clock.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/clock.qml
@@ -23,7 +23,7 @@ Rectangle {
         transform: Rotation {
             id: hourRotation
             origin.x: 7.5; origin.y: 73; angle: 0
-            angle: SpringFollow {
+            SpringFollow on angle {
                 spring: 2; damping: 0.2; modulus: 360
                 source: (clock.hours * 30) + (clock.minutes * 0.5)
             }
@@ -37,7 +37,7 @@ Rectangle {
         transform: Rotation {
             id: minuteRotation
             origin.x: 6.5; origin.y: 83; angle: 0
-            angle: SpringFollow {
+            SpringFollow on angle {
                 spring: 2; damping: 0.2; modulus: 360
                 source: clock.minutes * 6
             }
@@ -51,7 +51,7 @@ Rectangle {
         transform: Rotation {
             id: secondRotation
             origin.x: 2.5; origin.y: 80; angle: 0
-            angle: SpringFollow {
+            SpringFollow on angle {
                 spring: 5; damping: 0.25; modulus: 360
                 source: clock.seconds * 6
             }
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/content/background.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/background.png
index a885950..a885950 100644
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/content/background.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/background.png
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/content/center.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/center.png
index 7fbd802..7fbd802 100755
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/content/center.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/center.png
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/content/clock.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/clock.png
index 462edac..462edac 100755
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/content/clock.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/clock.png
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/content/hour.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/hour.png
index f8061a1..f8061a1 100755
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/content/hour.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/hour.png
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/content/minute.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/minute.png
index 1297ec7..1297ec7 100755
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/content/minute.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/minute.png
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/content/second.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/second.png
index 4aa9fb5..4aa9fb5 100755
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/content/second.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/content/second.png
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.0.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.0.png
index baf1d45..baf1d45 100644
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.1.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.1.png
index 932f63f..932f63f 100644
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.2.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.2.png
index a5cb437..a5cb437 100644
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.3.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.3.png
index 62e895c..62e895c 100644
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.qml b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.qml
index ffc6a5e..ffc6a5e 100644
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/clock.qml
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.0.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.0.png
index 3f42e75..3f42e75 100644
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.1.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.1.png
index d661df6..d661df6 100644
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.10.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.10.png
index e8c96e1..e8c96e1 100644
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.10.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.10.png
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.2.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.2.png
index 35bfa43..35bfa43 100644
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.3.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.3.png
index 74141cf..74141cf 100644
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.4.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.4.png
index 9544054..9544054 100644
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.4.png
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.5.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.5.png
index 4b02c79..4b02c79 100644
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.5.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.5.png
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.6.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.6.png
index 8ea8345..8ea8345 100644
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.6.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.6.png
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.7.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.7.png
index 76a73e8..76a73e8 100644
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.7.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.7.png
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.8.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.8.png
index 8824940..8824940 100644
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.8.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.8.png
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.9.png b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.9.png
index f954cc5..f954cc5 100644
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.9.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.9.png
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.qml b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.qml
index fec5428..fec5428 100644
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/data/follow.qml
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/follow.qml b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/follow.qml
index e9c94c7..1659bb7 100644
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/follow.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/follow.qml
@@ -7,7 +7,7 @@ Rectangle {
         id: rect
         color: "#00ff00"
         y: 200; width: 60; height: 20
-        y: SequentialAnimation {
+        SequentialAnimation on y {
             loops: Animation.Infinite
             NumberAnimation {
                 to: 20; duration: 500
@@ -26,7 +26,7 @@ Rectangle {
         color: "#ff0000"
         x: rect.width; width: rect.width; height: 20
         y: 200
-        y: SpringFollow { source: rect.y; velocity: 200 }
+        SpringFollow on y { source: rect.y; velocity: 200 }
     }
 
     // Spring
@@ -34,13 +34,13 @@ Rectangle {
         color: "#ff0000"
         x: rect.width * 2; width: rect.width/2; height: 20
         y: 200
-        y: SpringFollow { source: rect.y; spring: 1.0; damping: 0.2 }
+        SpringFollow on y { source: rect.y; spring: 1.0; damping: 0.2 }
     }
     Rectangle {
         color: "#880000"
         x: rect.width * 2.5; width: rect.width/2; height: 20
         y: 200
-        y: SpringFollow { source: rect.y; spring: 1.0; damping: 0.2; mass: 3.0 } // "heavier" object
+        SpringFollow on y { source: rect.y; spring: 1.0; damping: 0.2; mass: 3.0 } // "heavier" object
     }
 
     // Follow mouse
@@ -52,8 +52,8 @@ Rectangle {
             width: 20; height: 20
             radius: 10
             color: "#0000ff"
-            x: SpringFollow { id: f1; source: mouseRegion.mouseX-10; spring: 1.0; damping: 0.05; epsilon: 0.25 }
-            y: SpringFollow { id: f2; source: mouseRegion.mouseY-10; spring: 1.0; damping: 0.05; epsilon: 0.25 }
+            SpringFollow on x { id: f1; source: mouseRegion.mouseX-10; spring: 1.0; damping: 0.05; epsilon: 0.25 }
+            SpringFollow on y { id: f2; source: mouseRegion.mouseY-10; spring: 1.0; damping: 0.05; epsilon: 0.25 }
             states: [
                 State {
                     name: "following"
diff --git a/tests/auto/declarative/visual/qdeclarativetext/baseline/data/parentanchor.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.qml
index 56d616e..56d616e 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/baseline/data/parentanchor.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetext/baseline/data-X11/parentanchor.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data/parentanchor.qml
index 56d616e..56d616e 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/baseline/data-X11/parentanchor.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data/parentanchor.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetext/baseline/parentanchor.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/parentanchor.qml
index 80f0f03..80f0f03 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/baseline/parentanchor.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/parentanchor.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.0.png
index eea3362..eea3362 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.qml
index 1ccede4..1ccede4 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.0.png
index 3dfade5..3dfade5 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.1.png
index 1ee2076..1ee2076 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.2.png
index ae680be..ae680be 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.3.png
index c2859be..c2859be 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.qml
index 07ad236..07ad236 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/multilength.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.0.png
index 80549b4..80549b4 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/multilength.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/multilength.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.qml
index c2fd0d8..c2fd0d8 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/multilength.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/elide.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.0.png
index 5631a46..5631a46 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/elide.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/elide.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.qml
index cfd832e..cfd832e 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/elide.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/multilength.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.0.png
index 6e2b625..6e2b625 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/multilength.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/multilength.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.qml
index 0c06196..0c06196 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/multilength.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide.0.png
index 1a8c89b..1a8c89b 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide.qml
index 59f17f7..59f17f7 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.0.png
index 3dfade5..3dfade5 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.1.png
index 1ee2076..1ee2076 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.2.png
index ae680be..ae680be 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.3.png
index c2859be..c2859be 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.qml
index c592f18..c592f18 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data/elide2.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/elide.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/elide.qml
index fa6b5da..fa6b5da 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/elide/elide.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/elide.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/elide2.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/elide2.qml
index ecd9470..ecd9470 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/elide/elide2.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/elide2.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/multilength.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/multilength.qml
index ab6e1533..ab6e1533 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/elide/multilength.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/multilength.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/plaintext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png
index 67b497f..67b497f 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/plaintext.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/plaintext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.qml
index ab17eb1..ab17eb1 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/plaintext.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/richtext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png
index 6379942..6379942 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/richtext.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/richtext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.qml
index 72499b9..72499b9 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/richtext.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetext/font/data/plaintext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext.0.png
index 50d56dc..50d56dc 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/font/data/plaintext.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativetext/font/data/plaintext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext.qml
index f4cbcbd..f4cbcbd 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/font/data/plaintext.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetext/font/data/richtext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext.0.png
index 2910670..2910670 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/font/data/richtext.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativetext/font/data/richtext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext.qml
index 9f396c2..9f396c2 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/font/data/richtext.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetext/font/plaintext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml
index a3aa929..a3aa929 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/font/plaintext.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetext/font/richtext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext.qml
index 35aa232..35aa232 100644
--- a/tests/auto/declarative/visual/qdeclarativetext/font/richtext.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/cursorDelegate.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/cursorDelegate.qml
index 5516fc9..5516fc9 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/cursorDelegate.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/cursorDelegate.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.0.png
index 464a578..464a578 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.1.png
index 9beb1ca..9beb1ca 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.2.png
index 001be30..001be30 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.3.png
index fc3e4b3..fc3e4b3 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.4.png
index 24f43e6..24f43e6 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.4.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.5.png
index 001223b..001223b 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.5.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.5.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.6.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.6.png
index 7126e07..7126e07 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.6.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.6.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.7.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.7.png
index f0bea88..f0bea88 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.7.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.7.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.8.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.8.png
index 4381b8d..4381b8d 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.8.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.8.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.qml
index 8ee92d7..8ee92d7 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.0.png
index cc1774f..cc1774f 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.1.png
index 60eba16..60eba16 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.2.png
index d4663f7..d4663f7 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.3.png
index dc1bb52..dc1bb52 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.qml
index 84c16e1..84c16e1 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.0.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.1.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.2.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.3.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.4.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.4.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.5.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.5.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.5.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.6.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.6.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.6.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.6.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.qml
index 4ff00f4..4ff00f4 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.0.png
index 555996a..555996a 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.1.png
index b705bad..b705bad 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.2.png
index 094cd2a..094cd2a 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.3.png
index 9c519c7..9c519c7 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.4.png
index 3ec77b5..3ec77b5 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.4.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.5.png
index 579a66e..579a66e 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.5.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.5.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.6.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.6.png
index 9e5ac90..9e5ac90 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.6.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.6.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.7.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.7.png
index 9f3acfc..9f3acfc 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.7.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.7.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.8.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.8.png
index f27518a..f27518a 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.8.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.8.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.qml
index 8578d48..8578d48 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/cursorDelegate.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/qt-669.0.png
index 95a835a..95a835a 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/qt-669.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/qt-669.1.png
index 409192c..409192c 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/qt-669.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/qt-669.2.png
index cd2f112..cd2f112 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/qt-669.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/qt-669.3.png
index 7191c1e..7191c1e 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/qt-669.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/qt-669.qml
index 352c890..352c890 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/qt-669.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/wrap.0.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/wrap.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/wrap.1.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/wrap.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/wrap.2.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/wrap.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/wrap.3.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/wrap.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/wrap.4.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/wrap.4.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/wrap.5.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.5.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/wrap.5.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.6.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/wrap.6.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.6.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/wrap.6.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/wrap.qml
index f96daa9..f96daa9 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/wrap.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/qt-669.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/qt-669.qml
index b01ddf8..b01ddf8 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/qt-669.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/qt-669.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/wrap.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/wrap.qml
index f9fe025..f9fe025 100644
--- a/tests/auto/declarative/visual/qdeclarativetextedit/wrap.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/wrap.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/cursorDelegate.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/cursorDelegate.qml
index 199f71f..09f16ab 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/cursorDelegate.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/cursorDelegate.qml
@@ -3,17 +3,17 @@ import Qt 4.6
     resources: [
         Component { id: cursorA
             Item { id: cPage;
-                x: Behavior { NumberAnimation { } }
-                y: Behavior { NumberAnimation { } }
-                height: Behavior { NumberAnimation { duration: 200 } }
+                Behavior on x { NumberAnimation { } }
+                Behavior on y { NumberAnimation { } }
+                Behavior on height { NumberAnimation { duration: 200 } }
                 Rectangle { id: cRectangle; color: "black"; y: 1; width: 1; height: parent.height-2;
                     Rectangle { id:top; color: "black"; width: 3; height: 1; x: -1; y:0}
                     Rectangle { id:bottom; color: "black"; width: 3; height: 1; x: -1; anchors.bottom: parent.bottom;}
                     opacity: 1
-                    opacity: SequentialAnimation { running: cPage.parent.focus == true; loops: Animation.Infinite;
-                                NumberAnimation { properties: "opacity"; to: 1; duration: 500; easing.type: "InQuad"}
-                                NumberAnimation { properties: "opacity"; to: 0; duration: 500; easing.type: "OutQuad"}
-                             }
+                    SequentialAnimation on opacity { running: cPage.parent.focus == true; loops: Animation.Infinite;
+                        NumberAnimation { properties: "opacity"; to: 1; duration: 500; easing.type: "InQuad"}
+                        NumberAnimation { properties: "opacity"; to: 0; duration: 500; easing.type: "OutQuad"}
+                     }
                 }
                 width: 1;
             }
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.0.png
index 9d0bab2..9d0bab2 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.1.png
index db66ff7..db66ff7 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.2.png
index cbcca68..cbcca68 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.3.png
index c22196b..c22196b 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.4.png
index a1d051e..a1d051e 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.4.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.5.png
index 9289dc0..9289dc0 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.5.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.5.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.6.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.6.png
index 7331f89..7331f89 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.6.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.6.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.7.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.7.png
index 968bdd2..968bdd2 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.7.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.7.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.8.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.8.png
index 9a3436a..9a3436a 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.8.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.8.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.qml
index 3b664b6..3b664b6 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.0.png
index 2b45a06..2b45a06 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.1.png
index 1f5bae0..1f5bae0 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.2.png
index cb2b5a4..cb2b5a4 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.3.png
index aa24805..aa24805 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.4.png
index aa24805..aa24805 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.4.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.qml
index dd7b291..dd7b291 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/echoMode.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/hAlign.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/hAlign.0.png
index 87c2e07..87c2e07 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data/hAlign.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/hAlign.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/hAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/hAlign.qml
index e29ac56..e29ac56 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data/hAlign.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/hAlign.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.0.png
index f04f65e..f04f65e 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.1.png
index 46a703a..46a703a 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.2.png
index e4a3877..e4a3877 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.3.png
index 9ef842a..9ef842a 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.4.png
index 706e2b3..706e2b3 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.4.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.5.png
index bcc86cc..bcc86cc 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.5.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.5.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.6.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.6.png
index 51ddd44..51ddd44 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.6.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.6.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.7.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.7.png
index 0a2fdda..0a2fdda 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.7.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.7.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.8.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.8.png
index 9c88bff..9c88bff 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.8.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.8.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.qml
index df2dd38..df2dd38 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/cursorDelegate.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.0.png
index 2b45a06..2b45a06 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.1.png
index 1f5bae0..1f5bae0 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.1.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.2.png
index cb2b5a4..cb2b5a4 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.2.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.3.png
index aa24805..aa24805 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.3.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.4.png
index aa24805..aa24805 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.4.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.qml
index 873a86d..873a86d 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/echoMode.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/hAlign.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/hAlign.0.png
index 87c2e07..87c2e07 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/hAlign.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/hAlign.0.png
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/hAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/hAlign.qml
index e29ac56..e29ac56 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/hAlign.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/hAlign.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/echoMode.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/echoMode.qml
index b0b50e4..b0b50e4 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/echoMode.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/echoMode.qml
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/hAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/hAlign.qml
index 2d65adf..2d65adf 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/hAlign.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/hAlign.qml
diff --git a/tests/auto/declarative/visual/qfxwebview/autosize/autosize.qml b/tests/auto/declarative/qmlvisual/qfxwebview/autosize/autosize.qml
index 3c00ee6..3c00ee6 100644
--- a/tests/auto/declarative/visual/qfxwebview/autosize/autosize.qml
+++ b/tests/auto/declarative/qmlvisual/qfxwebview/autosize/autosize.qml
diff --git a/tests/auto/declarative/visual/qfxwebview/autosize/data/autosize.0.png b/tests/auto/declarative/qmlvisual/qfxwebview/autosize/data-X11/autosize.0.png
index 1f28b9a..1f28b9a 100644
--- a/tests/auto/declarative/visual/qfxwebview/autosize/data/autosize.0.png
+++ b/tests/auto/declarative/qmlvisual/qfxwebview/autosize/data-X11/autosize.0.png
diff --git a/tests/auto/declarative/visual/qfxwebview/autosize/data-X11/autosize.qml b/tests/auto/declarative/qmlvisual/qfxwebview/autosize/data-X11/autosize.qml
index d920a4c..d920a4c 100644
--- a/tests/auto/declarative/visual/qfxwebview/autosize/data-X11/autosize.qml
+++ b/tests/auto/declarative/qmlvisual/qfxwebview/autosize/data-X11/autosize.qml
diff --git a/tests/auto/declarative/visual/qfxwebview/autosize/data-X11/autosize.0.png b/tests/auto/declarative/qmlvisual/qfxwebview/autosize/data/autosize.0.png
index 1f28b9a..1f28b9a 100644
--- a/tests/auto/declarative/visual/qfxwebview/autosize/data-X11/autosize.0.png
+++ b/tests/auto/declarative/qmlvisual/qfxwebview/autosize/data/autosize.0.png
diff --git a/tests/auto/declarative/visual/qfxwebview/autosize/data/autosize.qml b/tests/auto/declarative/qmlvisual/qfxwebview/autosize/data/autosize.qml
index 47999be..47999be 100644
--- a/tests/auto/declarative/visual/qfxwebview/autosize/data/autosize.qml
+++ b/tests/auto/declarative/qmlvisual/qfxwebview/autosize/data/autosize.qml
diff --git a/tests/auto/declarative/visual/visual.pro b/tests/auto/declarative/qmlvisual/qmlvisual.pro
index 7ae2bed..f2b3bca 100644
--- a/tests/auto/declarative/visual/visual.pro
+++ b/tests/auto/declarative/qmlvisual/qmlvisual.pro
@@ -2,6 +2,6 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_visual.cpp
+SOURCES += tst_qmlvisual.cpp
 
 DEFINES += QT_TEST_SOURCE_DIR=\"\\\"$$PWD\\\"\"
diff --git a/tests/auto/declarative/visual/rect/GradientRect.qml b/tests/auto/declarative/qmlvisual/rect/GradientRect.qml
index 1d3ec98..1d3ec98 100644
--- a/tests/auto/declarative/visual/rect/GradientRect.qml
+++ b/tests/auto/declarative/qmlvisual/rect/GradientRect.qml
diff --git a/tests/auto/declarative/visual/rect/MyRect.qml b/tests/auto/declarative/qmlvisual/rect/MyRect.qml
index 22e0948..22e0948 100644
--- a/tests/auto/declarative/visual/rect/MyRect.qml
+++ b/tests/auto/declarative/qmlvisual/rect/MyRect.qml
diff --git a/tests/auto/declarative/visual/rect/data/rect-painting.0.png b/tests/auto/declarative/qmlvisual/rect/data/rect-painting.0.png
index 3b7970d..3b7970d 100644
--- a/tests/auto/declarative/visual/rect/data/rect-painting.0.png
+++ b/tests/auto/declarative/qmlvisual/rect/data/rect-painting.0.png
diff --git a/tests/auto/declarative/visual/rect/data/rect-painting.qml b/tests/auto/declarative/qmlvisual/rect/data/rect-painting.qml
index 52acadf..52acadf 100644
--- a/tests/auto/declarative/visual/rect/data/rect-painting.qml
+++ b/tests/auto/declarative/qmlvisual/rect/data/rect-painting.qml
diff --git a/tests/auto/declarative/visual/rect/rect-painting.qml b/tests/auto/declarative/qmlvisual/rect/rect-painting.qml
index 93beeec..93beeec 100644
--- a/tests/auto/declarative/visual/rect/rect-painting.qml
+++ b/tests/auto/declarative/qmlvisual/rect/rect-painting.qml
diff --git a/tests/auto/declarative/visual/repeater/basic1.qml b/tests/auto/declarative/qmlvisual/repeater/basic1.qml
index acb669c..acb669c 100644
--- a/tests/auto/declarative/visual/repeater/basic1.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/basic1.qml
diff --git a/tests/auto/declarative/visual/repeater/basic2.qml b/tests/auto/declarative/qmlvisual/repeater/basic2.qml
index 3323da5..3323da5 100644
--- a/tests/auto/declarative/visual/repeater/basic2.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/basic2.qml
diff --git a/tests/auto/declarative/visual/repeater/basic3.qml b/tests/auto/declarative/qmlvisual/repeater/basic3.qml
index cb57d49..cb57d49 100644
--- a/tests/auto/declarative/visual/repeater/basic3.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/basic3.qml
diff --git a/tests/auto/declarative/visual/repeater/basic4.qml b/tests/auto/declarative/qmlvisual/repeater/basic4.qml
index f31de2c..f31de2c 100644
--- a/tests/auto/declarative/visual/repeater/basic4.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/basic4.qml
diff --git a/tests/auto/declarative/visual/repeater/data-MAC/basic1.0.png b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic1.0.png
index 2658b6b..2658b6b 100644
--- a/tests/auto/declarative/visual/repeater/data-MAC/basic1.0.png
+++ b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic1.0.png
diff --git a/tests/auto/declarative/visual/repeater/data-MAC/basic1.qml b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic1.qml
index 5bc0d6b..5bc0d6b 100644
--- a/tests/auto/declarative/visual/repeater/data-MAC/basic1.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic1.qml
diff --git a/tests/auto/declarative/visual/repeater/data-MAC/basic2.0.png b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic2.0.png
index 2658b6b..2658b6b 100644
--- a/tests/auto/declarative/visual/repeater/data-MAC/basic2.0.png
+++ b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic2.0.png
diff --git a/tests/auto/declarative/visual/repeater/data-MAC/basic2.qml b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic2.qml
index 64cf2ea..64cf2ea 100644
--- a/tests/auto/declarative/visual/repeater/data-MAC/basic2.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic2.qml
diff --git a/tests/auto/declarative/visual/repeater/data-MAC/basic3.0.png b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic3.0.png
index 2658b6b..2658b6b 100644
--- a/tests/auto/declarative/visual/repeater/data-MAC/basic3.0.png
+++ b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic3.0.png
diff --git a/tests/auto/declarative/visual/repeater/data-MAC/basic3.qml b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic3.qml
index 41e174a..41e174a 100644
--- a/tests/auto/declarative/visual/repeater/data-MAC/basic3.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic3.qml
diff --git a/tests/auto/declarative/visual/repeater/data-MAC/basic4.0.png b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic4.0.png
index 2658b6b..2658b6b 100644
--- a/tests/auto/declarative/visual/repeater/data-MAC/basic4.0.png
+++ b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic4.0.png
diff --git a/tests/auto/declarative/visual/repeater/data-MAC/basic4.qml b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic4.qml
index fcf2504..fcf2504 100644
--- a/tests/auto/declarative/visual/repeater/data-MAC/basic4.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic4.qml
diff --git a/tests/auto/declarative/visual/repeater/data-X11/basic1.0.png b/tests/auto/declarative/qmlvisual/repeater/data-X11/basic1.0.png
index 18ab543..18ab543 100644
--- a/tests/auto/declarative/visual/repeater/data-X11/basic1.0.png
+++ b/tests/auto/declarative/qmlvisual/repeater/data-X11/basic1.0.png
diff --git a/tests/auto/declarative/visual/repeater/data-X11/basic1.qml b/tests/auto/declarative/qmlvisual/repeater/data-X11/basic1.qml
index bf215ca..bf215ca 100644
--- a/tests/auto/declarative/visual/repeater/data-X11/basic1.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/data-X11/basic1.qml
diff --git a/tests/auto/declarative/visual/repeater/data-X11/basic2.0.png b/tests/auto/declarative/qmlvisual/repeater/data-X11/basic2.0.png
index 18ab543..18ab543 100644
--- a/tests/auto/declarative/visual/repeater/data-X11/basic2.0.png
+++ b/tests/auto/declarative/qmlvisual/repeater/data-X11/basic2.0.png
diff --git a/tests/auto/declarative/visual/repeater/data-X11/basic2.qml b/tests/auto/declarative/qmlvisual/repeater/data-X11/basic2.qml
index cb6b46c..cb6b46c 100644
--- a/tests/auto/declarative/visual/repeater/data-X11/basic2.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/data-X11/basic2.qml
diff --git a/tests/auto/declarative/visual/repeater/data-X11/basic3.0.png b/tests/auto/declarative/qmlvisual/repeater/data-X11/basic3.0.png
index 18ab543..18ab543 100644
--- a/tests/auto/declarative/visual/repeater/data-X11/basic3.0.png
+++ b/tests/auto/declarative/qmlvisual/repeater/data-X11/basic3.0.png
diff --git a/tests/auto/declarative/visual/repeater/data-X11/basic3.qml b/tests/auto/declarative/qmlvisual/repeater/data-X11/basic3.qml
index 9545fa9..9545fa9 100644
--- a/tests/auto/declarative/visual/repeater/data-X11/basic3.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/data-X11/basic3.qml
diff --git a/tests/auto/declarative/visual/repeater/data-X11/basic4.0.png b/tests/auto/declarative/qmlvisual/repeater/data-X11/basic4.0.png
index 18ab543..18ab543 100644
--- a/tests/auto/declarative/visual/repeater/data-X11/basic4.0.png
+++ b/tests/auto/declarative/qmlvisual/repeater/data-X11/basic4.0.png
diff --git a/tests/auto/declarative/visual/repeater/data-X11/basic4.qml b/tests/auto/declarative/qmlvisual/repeater/data-X11/basic4.qml
index 4839206..4839206 100644
--- a/tests/auto/declarative/visual/repeater/data-X11/basic4.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/data-X11/basic4.qml
diff --git a/tests/auto/declarative/visual/repeater/data/basic1.0.png b/tests/auto/declarative/qmlvisual/repeater/data/basic1.0.png
index aea0e98..aea0e98 100644
--- a/tests/auto/declarative/visual/repeater/data/basic1.0.png
+++ b/tests/auto/declarative/qmlvisual/repeater/data/basic1.0.png
diff --git a/tests/auto/declarative/visual/repeater/data/basic1.qml b/tests/auto/declarative/qmlvisual/repeater/data/basic1.qml
index 9535a2c..9535a2c 100644
--- a/tests/auto/declarative/visual/repeater/data/basic1.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/data/basic1.qml
diff --git a/tests/auto/declarative/visual/repeater/data/basic2.0.png b/tests/auto/declarative/qmlvisual/repeater/data/basic2.0.png
index aea0e98..aea0e98 100644
--- a/tests/auto/declarative/visual/repeater/data/basic2.0.png
+++ b/tests/auto/declarative/qmlvisual/repeater/data/basic2.0.png
diff --git a/tests/auto/declarative/visual/repeater/data/basic2.qml b/tests/auto/declarative/qmlvisual/repeater/data/basic2.qml
index 81bc1f7..81bc1f7 100644
--- a/tests/auto/declarative/visual/repeater/data/basic2.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/data/basic2.qml
diff --git a/tests/auto/declarative/visual/repeater/data/basic3.0.png b/tests/auto/declarative/qmlvisual/repeater/data/basic3.0.png
index aea0e98..aea0e98 100644
--- a/tests/auto/declarative/visual/repeater/data/basic3.0.png
+++ b/tests/auto/declarative/qmlvisual/repeater/data/basic3.0.png
diff --git a/tests/auto/declarative/visual/repeater/data/basic3.qml b/tests/auto/declarative/qmlvisual/repeater/data/basic3.qml
index 417eaab..417eaab 100644
--- a/tests/auto/declarative/visual/repeater/data/basic3.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/data/basic3.qml
diff --git a/tests/auto/declarative/visual/repeater/data/basic4.0.png b/tests/auto/declarative/qmlvisual/repeater/data/basic4.0.png
index aea0e98..aea0e98 100644
--- a/tests/auto/declarative/visual/repeater/data/basic4.0.png
+++ b/tests/auto/declarative/qmlvisual/repeater/data/basic4.0.png
diff --git a/tests/auto/declarative/visual/repeater/data/basic4.qml b/tests/auto/declarative/qmlvisual/repeater/data/basic4.qml
index 264d825..264d825 100644
--- a/tests/auto/declarative/visual/repeater/data/basic4.qml
+++ b/tests/auto/declarative/qmlvisual/repeater/data/basic4.qml
diff --git a/tests/auto/declarative/visual/selftest_noimages/data/selftest_noimages.qml b/tests/auto/declarative/qmlvisual/selftest_noimages/data/selftest_noimages.qml
index 3104906..3104906 100644
--- a/tests/auto/declarative/visual/selftest_noimages/data/selftest_noimages.qml
+++ b/tests/auto/declarative/qmlvisual/selftest_noimages/data/selftest_noimages.qml
diff --git a/tests/auto/declarative/visual/selftest_noimages/selftest_noimages.qml b/tests/auto/declarative/qmlvisual/selftest_noimages/selftest_noimages.qml
index da7f9b6..da7f9b6 100644
--- a/tests/auto/declarative/visual/selftest_noimages/selftest_noimages.qml
+++ b/tests/auto/declarative/qmlvisual/selftest_noimages/selftest_noimages.qml
diff --git a/tests/auto/declarative/visual/tst_visual.cpp b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
index cd88e87..8f1a406 100644
--- a/tests/auto/declarative/visual/tst_visual.cpp
+++ b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
@@ -50,11 +50,11 @@
 enum Mode { Record, RecordNoVisuals, Play, TestVisuals, RemoveVisuals, UpdateVisuals, UpdatePlatformVisuals, Test };
 
 static QString testdir;
-class tst_visual : public QObject
+class tst_qmlvisual : public QObject
 {
     Q_OBJECT
 public:
-    tst_visual();
+    tst_qmlvisual();
 
     static QString toTestScript(const QString &, Mode=Test);
     static QString viewer();
@@ -69,12 +69,12 @@ private:
 };
 
 
-tst_visual::tst_visual() 
+tst_qmlvisual::tst_qmlvisual()
 {
     qmlruntime = viewer();
 }
 
-QString tst_visual::viewer()
+QString tst_qmlvisual::viewer()
 {
     QString binaries = QLibraryInfo::location(QLibraryInfo::BinariesPath);
 
@@ -91,24 +91,32 @@ QString tst_visual::viewer()
     return qmlruntime;
 }
 
-void tst_visual::visual_data()
+void tst_qmlvisual::visual_data()
 {
     QTest::addColumn<QString>("file");
     QTest::addColumn<QString>("testdata");
 
     QStringList files;
-    files << findQmlFiles(QDir(QT_TEST_SOURCE_DIR));
+    if (qgetenv("QMLVISUAL_ALL") != "")
+        files << findQmlFiles(QDir(QT_TEST_SOURCE_DIR));
+    else {
+        //these are tests we think are stable and useful enough to be run by the CI system
+        files << QT_TEST_SOURCE_DIR "/animation/pauseAnimation/pauseAnimation-visual.qml";
+        files << QT_TEST_SOURCE_DIR "/animation/parentAnimation/parentAnimation-visual.qml";
+        files << QT_TEST_SOURCE_DIR "/animation/reanchor/reanchor.qml";
+    }
+
 
     foreach (const QString &file, files) {
         QString testdata = toTestScript(file);
         if (testdata.isEmpty())
             continue;
-        
+
         QTest::newRow(file.toLatin1().constData()) << file << testdata;
     }
 }
 
-void tst_visual::visual()
+void tst_qmlvisual::visual()
 {
     QFETCH(QString, file);
     QFETCH(QString, testdata);
@@ -116,7 +124,7 @@ void tst_visual::visual()
     QStringList arguments;
     arguments << "-script" << testdata
               << "-scriptopts" << "play,testimages,testerror,exitoncomplete,exitonfailure" 
-              << file;
+              << file << "-graphicssystem" << "raster";
     QProcess p;
     p.start(qmlruntime, arguments);
     QVERIFY(p.waitForFinished());
@@ -126,7 +134,7 @@ void tst_visual::visual()
     QCOMPARE(p.exitCode(), 0);
 }
 
-QString tst_visual::toTestScript(const QString &file, Mode mode)
+QString tst_qmlvisual::toTestScript(const QString &file, Mode mode)
 {
     if (!file.endsWith(".qml"))
         return QString();
@@ -176,7 +184,7 @@ QString tst_visual::toTestScript(const QString &file, Mode mode)
     return testdata;
 }
 
-QStringList tst_visual::findQmlFiles(const QDir &d)
+QStringList tst_qmlvisual::findQmlFiles(const QDir &d)
 {
     QStringList rv;
 
@@ -206,7 +214,7 @@ void action(Mode mode, const QString &file)
 {
     Q_ASSERT(mode != Test);
 
-    QString testdata = tst_visual::toTestScript(file,mode);
+    QString testdata = tst_qmlvisual::toTestScript(file,mode);
 
     QStringList arguments;
     switch (mode) {
@@ -248,7 +256,7 @@ void action(Mode mode, const QString &file)
     if (!arguments.isEmpty()) {
         QProcess p;
         p.setProcessChannelMode(QProcess::ForwardedChannels);
-        p.start(tst_visual::viewer(), arguments);
+        p.start(tst_qmlvisual::viewer(), arguments);
         p.waitForFinished();
     }
 }
@@ -257,7 +265,7 @@ void usage()
 {
     fprintf(stderr, "\n");
     fprintf(stderr, "QML related options\n");
-    fprintf(stderr, " -listtests                  : list all the tests seen by tst_visual, and then exit immediately\n");
+    fprintf(stderr, " -listtests                  : list all the tests seen by tst_qmlvisual, and then exit immediately\n");
     fprintf(stderr, " -record file                : record new test data for file\n");
     fprintf(stderr, " -recordnovisuals file       : record new test data for file, but ignore visuals\n");
     fprintf(stderr, " -play file                  : playback test data for file, printing errors\n");
@@ -268,12 +276,12 @@ void usage()
         "Visual tests are recordings of manual interactions with a QML test,\n"
         "that can then be run automatically. To record a new test, run:\n"
         "\n"
-        "  tst_visual -record yourtestdir/yourtest.qml\n"
+        "  tst_qmlvisual -record yourtestdir/yourtest.qml\n"
         "\n"
         "This records everything you do (try to keep it short).\n"
         "To play back a test, run:\n"
         "\n"
-        "  tst_visual -play yourtestdir/yourtest.qml\n"
+        "  tst_qmlvisual -play yourtestdir/yourtest.qml\n"
         "\n"
         "Your test may include QML code to test itself, reporting any error to an\n"
         "'error' property on the root object - the test will fail if this property\n"
@@ -282,7 +290,7 @@ void usage()
         "If your test changes slightly but is still correct (check with -play), you\n"
         "can update the visuals by running:\n"
         "\n"
-        "  tst_visual -updatevisuals yourtestdir/yourtest.qml\n"
+        "  tst_qmlvisual -updatevisuals yourtestdir/yourtest.qml\n"
         "\n"
         "If your test includes platform-sensitive visuals (eg. text in system fonts),\n"
         "you should create platform-specific visuals, using -updateplatformvisuals\n"
@@ -339,7 +347,7 @@ int main(int argc, char **argv)
         }
 
         if (arg == "-listtests") {
-            QStringList list = tst_visual::findQmlFiles(QDir(QT_TEST_SOURCE_DIR));
+            QStringList list = tst_qmlvisual::findQmlFiles(QDir(QT_TEST_SOURCE_DIR));
             foreach (QString test, list) {
                 qWarning() << qPrintable(test);
             }
@@ -348,7 +356,7 @@ int main(int argc, char **argv)
     }
 
     if (mode == Test || showHelp) {
-        tst_visual tc;
+        tst_qmlvisual tc;
         return QTest::qExec(&tc, newArgc, newArgv);
     } else {
         if (!file.endsWith(QLatin1String(".qml"))) {
@@ -367,4 +375,4 @@ int main(int argc, char **argv)
     }
 }
 
-#include "tst_visual.moc"
+#include "tst_qmlvisual.moc"
diff --git a/tests/auto/declarative/visual/webview/embedding/data/nesting.0.png b/tests/auto/declarative/qmlvisual/webview/embedding/data/nesting.0.png
index 57de710..57de710 100644
--- a/tests/auto/declarative/visual/webview/embedding/data/nesting.0.png
+++ b/tests/auto/declarative/qmlvisual/webview/embedding/data/nesting.0.png
diff --git a/tests/auto/declarative/visual/webview/embedding/data/nesting.qml b/tests/auto/declarative/qmlvisual/webview/embedding/data/nesting.qml
index 8d38ebe..8d38ebe 100644
--- a/tests/auto/declarative/visual/webview/embedding/data/nesting.qml
+++ b/tests/auto/declarative/qmlvisual/webview/embedding/data/nesting.qml
diff --git a/tests/auto/declarative/visual/webview/embedding/egg.qml b/tests/auto/declarative/qmlvisual/webview/embedding/egg.qml
index fe1bb70..fe1bb70 100644
--- a/tests/auto/declarative/visual/webview/embedding/egg.qml
+++ b/tests/auto/declarative/qmlvisual/webview/embedding/egg.qml
diff --git a/tests/auto/declarative/visual/webview/embedding/nesting.html b/tests/auto/declarative/qmlvisual/webview/embedding/nesting.html
index 6e81689..6e81689 100644
--- a/tests/auto/declarative/visual/webview/embedding/nesting.html
+++ b/tests/auto/declarative/qmlvisual/webview/embedding/nesting.html
diff --git a/tests/auto/declarative/visual/webview/embedding/nesting.qml b/tests/auto/declarative/qmlvisual/webview/embedding/nesting.qml
index 5e35306..5e35306 100644
--- a/tests/auto/declarative/visual/webview/embedding/nesting.qml
+++ b/tests/auto/declarative/qmlvisual/webview/embedding/nesting.qml
diff --git a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.0.png b/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.0.png
index 139aa9d..139aa9d 100644
--- a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.0.png
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.0.png
diff --git a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.1.png b/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.1.png
index e2e1644..e2e1644 100644
--- a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.1.png
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.1.png
diff --git a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.2.png b/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.2.png
index aa2fb82..aa2fb82 100644
--- a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.2.png
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.2.png
diff --git a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.3.png b/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.3.png
index 1976430..1976430 100644
--- a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.3.png
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.3.png
diff --git a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.4.png b/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.4.png
index c895a0a..c895a0a 100644
--- a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.4.png
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.4.png
diff --git a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.5.png b/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.5.png
index c895a0a..c895a0a 100644
--- a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.5.png
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.5.png
diff --git a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.6.png b/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.6.png
index c895a0a..c895a0a 100644
--- a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.6.png
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.6.png
diff --git a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.7.png b/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.7.png
index c895a0a..c895a0a 100644
--- a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.7.png
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.7.png
diff --git a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.8.png b/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.8.png
index c895a0a..c895a0a 100644
--- a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.8.png
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.8.png
diff --git a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.qml b/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.qml
index 957f9d5..957f9d5 100644
--- a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.qml
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/data/evaluateJavaScript.qml
diff --git a/tests/auto/declarative/visual/webview/javascript/data/windowObjects.0.png b/tests/auto/declarative/qmlvisual/webview/javascript/data/windowObjects.0.png
index b5c35d2..b5c35d2 100644
--- a/tests/auto/declarative/visual/webview/javascript/data/windowObjects.0.png
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/data/windowObjects.0.png
diff --git a/tests/auto/declarative/visual/webview/javascript/data/windowObjects.1.png b/tests/auto/declarative/qmlvisual/webview/javascript/data/windowObjects.1.png
index b5c35d2..b5c35d2 100644
--- a/tests/auto/declarative/visual/webview/javascript/data/windowObjects.1.png
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/data/windowObjects.1.png
diff --git a/tests/auto/declarative/visual/webview/javascript/data/windowObjects.2.png b/tests/auto/declarative/qmlvisual/webview/javascript/data/windowObjects.2.png
index 28403c8..28403c8 100644
--- a/tests/auto/declarative/visual/webview/javascript/data/windowObjects.2.png
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/data/windowObjects.2.png
diff --git a/tests/auto/declarative/visual/webview/javascript/data/windowObjects.3.png b/tests/auto/declarative/qmlvisual/webview/javascript/data/windowObjects.3.png
index 241b9f8..241b9f8 100644
--- a/tests/auto/declarative/visual/webview/javascript/data/windowObjects.3.png
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/data/windowObjects.3.png
diff --git a/tests/auto/declarative/visual/webview/javascript/data/windowObjects.4.png b/tests/auto/declarative/qmlvisual/webview/javascript/data/windowObjects.4.png
index 1877cb2..1877cb2 100644
--- a/tests/auto/declarative/visual/webview/javascript/data/windowObjects.4.png
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/data/windowObjects.4.png
diff --git a/tests/auto/declarative/visual/webview/javascript/data/windowObjects.qml b/tests/auto/declarative/qmlvisual/webview/javascript/data/windowObjects.qml
index 7fce295..7fce295 100644
--- a/tests/auto/declarative/visual/webview/javascript/data/windowObjects.qml
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/data/windowObjects.qml
diff --git a/tests/auto/declarative/visual/webview/javascript/evaluateJavaScript.qml b/tests/auto/declarative/qmlvisual/webview/javascript/evaluateJavaScript.qml
index 6c01382..6c01382 100644
--- a/tests/auto/declarative/visual/webview/javascript/evaluateJavaScript.qml
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/evaluateJavaScript.qml
diff --git a/tests/auto/declarative/visual/webview/javascript/test-objects.html b/tests/auto/declarative/qmlvisual/webview/javascript/test-objects.html
index ed7d2ea..ed7d2ea 100644
--- a/tests/auto/declarative/visual/webview/javascript/test-objects.html
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/test-objects.html
diff --git a/tests/auto/declarative/visual/webview/javascript/windowObjects.qml b/tests/auto/declarative/qmlvisual/webview/javascript/windowObjects.qml
index 8c52aff..8c52aff 100644
--- a/tests/auto/declarative/visual/webview/javascript/windowObjects.qml
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/windowObjects.qml
diff --git a/tests/auto/declarative/visual/webview/settings/data/fontFamily.0.png b/tests/auto/declarative/qmlvisual/webview/settings/data/fontFamily.0.png
index 7721e75..7721e75 100644
--- a/tests/auto/declarative/visual/webview/settings/data/fontFamily.0.png
+++ b/tests/auto/declarative/qmlvisual/webview/settings/data/fontFamily.0.png
diff --git a/tests/auto/declarative/visual/webview/settings/data/fontFamily.qml b/tests/auto/declarative/qmlvisual/webview/settings/data/fontFamily.qml
index 195c3ba..195c3ba 100644
--- a/tests/auto/declarative/visual/webview/settings/data/fontFamily.qml
+++ b/tests/auto/declarative/qmlvisual/webview/settings/data/fontFamily.qml
diff --git a/tests/auto/declarative/visual/webview/settings/data/fontSize.0.png b/tests/auto/declarative/qmlvisual/webview/settings/data/fontSize.0.png
index 95196a1..95196a1 100644
--- a/tests/auto/declarative/visual/webview/settings/data/fontSize.0.png
+++ b/tests/auto/declarative/qmlvisual/webview/settings/data/fontSize.0.png
diff --git a/tests/auto/declarative/visual/webview/settings/data/fontSize.qml b/tests/auto/declarative/qmlvisual/webview/settings/data/fontSize.qml
index 438ffa5..438ffa5 100644
--- a/tests/auto/declarative/visual/webview/settings/data/fontSize.qml
+++ b/tests/auto/declarative/qmlvisual/webview/settings/data/fontSize.qml
diff --git a/tests/auto/declarative/visual/webview/settings/data/noAutoLoadImages.0.png b/tests/auto/declarative/qmlvisual/webview/settings/data/noAutoLoadImages.0.png
index 48920a2..48920a2 100644
--- a/tests/auto/declarative/visual/webview/settings/data/noAutoLoadImages.0.png
+++ b/tests/auto/declarative/qmlvisual/webview/settings/data/noAutoLoadImages.0.png
diff --git a/tests/auto/declarative/visual/webview/settings/data/noAutoLoadImages.1.png b/tests/auto/declarative/qmlvisual/webview/settings/data/noAutoLoadImages.1.png
index 48920a2..48920a2 100644
--- a/tests/auto/declarative/visual/webview/settings/data/noAutoLoadImages.1.png
+++ b/tests/auto/declarative/qmlvisual/webview/settings/data/noAutoLoadImages.1.png
diff --git a/tests/auto/declarative/visual/webview/settings/data/noAutoLoadImages.qml b/tests/auto/declarative/qmlvisual/webview/settings/data/noAutoLoadImages.qml
index ead5c3b..ead5c3b 100644
--- a/tests/auto/declarative/visual/webview/settings/data/noAutoLoadImages.qml
+++ b/tests/auto/declarative/qmlvisual/webview/settings/data/noAutoLoadImages.qml
diff --git a/tests/auto/declarative/visual/webview/settings/data/setFontFamily.0.png b/tests/auto/declarative/qmlvisual/webview/settings/data/setFontFamily.0.png
index f3c621a..f3c621a 100644
--- a/tests/auto/declarative/visual/webview/settings/data/setFontFamily.0.png
+++ b/tests/auto/declarative/qmlvisual/webview/settings/data/setFontFamily.0.png
diff --git a/tests/auto/declarative/visual/webview/settings/data/setFontFamily.qml b/tests/auto/declarative/qmlvisual/webview/settings/data/setFontFamily.qml
index cf74d42..cf74d42 100644
--- a/tests/auto/declarative/visual/webview/settings/data/setFontFamily.qml
+++ b/tests/auto/declarative/qmlvisual/webview/settings/data/setFontFamily.qml
diff --git a/tests/auto/declarative/visual/webview/settings/fontFamily.qml b/tests/auto/declarative/qmlvisual/webview/settings/fontFamily.qml
index f547b0e..f547b0e 100644
--- a/tests/auto/declarative/visual/webview/settings/fontFamily.qml
+++ b/tests/auto/declarative/qmlvisual/webview/settings/fontFamily.qml
diff --git a/tests/auto/declarative/visual/webview/settings/fontSize.qml b/tests/auto/declarative/qmlvisual/webview/settings/fontSize.qml
index 7eaa96b..7eaa96b 100644
--- a/tests/auto/declarative/visual/webview/settings/fontSize.qml
+++ b/tests/auto/declarative/qmlvisual/webview/settings/fontSize.qml
diff --git a/tests/auto/declarative/visual/webview/settings/noAutoLoadImages.qml b/tests/auto/declarative/qmlvisual/webview/settings/noAutoLoadImages.qml
index 67f1633..67f1633 100644
--- a/tests/auto/declarative/visual/webview/settings/noAutoLoadImages.qml
+++ b/tests/auto/declarative/qmlvisual/webview/settings/noAutoLoadImages.qml
diff --git a/tests/auto/declarative/visual/animation/pauseAnimation/pics/qtlogo.png b/tests/auto/declarative/qmlvisual/webview/settings/qtlogo.png
index 399bd0b..399bd0b 100644
--- a/tests/auto/declarative/visual/animation/pauseAnimation/pics/qtlogo.png
+++ b/tests/auto/declarative/qmlvisual/webview/settings/qtlogo.png
diff --git a/tests/auto/declarative/visual/webview/settings/setFontFamily.qml b/tests/auto/declarative/qmlvisual/webview/settings/setFontFamily.qml
index 823469f..823469f 100644
--- a/tests/auto/declarative/visual/webview/settings/setFontFamily.qml
+++ b/tests/auto/declarative/qmlvisual/webview/settings/setFontFamily.qml
diff --git a/tests/auto/declarative/visual/webview/settings/tarzeau_ocr_a.ttf b/tests/auto/declarative/qmlvisual/webview/settings/tarzeau_ocr_a.ttf
index cf93f96..cf93f96 100644
--- a/tests/auto/declarative/visual/webview/settings/tarzeau_ocr_a.ttf
+++ b/tests/auto/declarative/qmlvisual/webview/settings/tarzeau_ocr_a.ttf
diff --git a/tests/auto/declarative/visual/webview/settings/test-img.html b/tests/auto/declarative/qmlvisual/webview/settings/test-img.html
index cdd63ac..cdd63ac 100644
--- a/tests/auto/declarative/visual/webview/settings/test-img.html
+++ b/tests/auto/declarative/qmlvisual/webview/settings/test-img.html
diff --git a/tests/auto/declarative/visual/webview/settings/test.html b/tests/auto/declarative/qmlvisual/webview/settings/test.html
index 3265e20..3265e20 100644
--- a/tests/auto/declarative/visual/webview/settings/test.html
+++ b/tests/auto/declarative/qmlvisual/webview/settings/test.html
diff --git a/tests/auto/declarative/visual/webview/zooming/data/pageWidth.qml b/tests/auto/declarative/qmlvisual/webview/zooming/data/pageWidth.qml
index 1a993e1..1a993e1 100644
--- a/tests/auto/declarative/visual/webview/zooming/data/pageWidth.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/data/pageWidth.qml
diff --git a/tests/auto/declarative/visual/webview/zooming/data/renderControl.0.png b/tests/auto/declarative/qmlvisual/webview/zooming/data/renderControl.0.png
index 38df70e..38df70e 100644
--- a/tests/auto/declarative/visual/webview/zooming/data/renderControl.0.png
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/data/renderControl.0.png
diff --git a/tests/auto/declarative/visual/webview/zooming/data/renderControl.qml b/tests/auto/declarative/qmlvisual/webview/zooming/data/renderControl.qml
index d3c5890..d3c5890 100644
--- a/tests/auto/declarative/visual/webview/zooming/data/renderControl.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/data/renderControl.qml
diff --git a/tests/auto/declarative/visual/webview/zooming/data/resolution.0.png b/tests/auto/declarative/qmlvisual/webview/zooming/data/resolution.0.png
index 7e989c6..7e989c6 100644
--- a/tests/auto/declarative/visual/webview/zooming/data/resolution.0.png
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/data/resolution.0.png
diff --git a/tests/auto/declarative/visual/webview/zooming/data/resolution.1.png b/tests/auto/declarative/qmlvisual/webview/zooming/data/resolution.1.png
index 60ccc0b..60ccc0b 100644
--- a/tests/auto/declarative/visual/webview/zooming/data/resolution.1.png
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/data/resolution.1.png
diff --git a/tests/auto/declarative/visual/webview/zooming/data/resolution.2.png b/tests/auto/declarative/qmlvisual/webview/zooming/data/resolution.2.png
index 6c22494..6c22494 100644
--- a/tests/auto/declarative/visual/webview/zooming/data/resolution.2.png
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/data/resolution.2.png
diff --git a/tests/auto/declarative/visual/webview/zooming/data/resolution.3.png b/tests/auto/declarative/qmlvisual/webview/zooming/data/resolution.3.png
index 71dd56f..71dd56f 100644
--- a/tests/auto/declarative/visual/webview/zooming/data/resolution.3.png
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/data/resolution.3.png
diff --git a/tests/auto/declarative/visual/webview/zooming/data/resolution.4.png b/tests/auto/declarative/qmlvisual/webview/zooming/data/resolution.4.png
index ce03cb6..ce03cb6 100644
--- a/tests/auto/declarative/visual/webview/zooming/data/resolution.4.png
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/data/resolution.4.png
diff --git a/tests/auto/declarative/visual/webview/zooming/data/resolution.qml b/tests/auto/declarative/qmlvisual/webview/zooming/data/resolution.qml
index 0a2b8db..0a2b8db 100644
--- a/tests/auto/declarative/visual/webview/zooming/data/resolution.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/data/resolution.qml
diff --git a/tests/auto/declarative/visual/webview/zooming/data/zoomTextOnly.0.png b/tests/auto/declarative/qmlvisual/webview/zooming/data/zoomTextOnly.0.png
index 4b9abb4..4b9abb4 100644
--- a/tests/auto/declarative/visual/webview/zooming/data/zoomTextOnly.0.png
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/data/zoomTextOnly.0.png
diff --git a/tests/auto/declarative/visual/webview/zooming/data/zoomTextOnly.1.png b/tests/auto/declarative/qmlvisual/webview/zooming/data/zoomTextOnly.1.png
index 5ce9787..5ce9787 100644
--- a/tests/auto/declarative/visual/webview/zooming/data/zoomTextOnly.1.png
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/data/zoomTextOnly.1.png
diff --git a/tests/auto/declarative/visual/webview/zooming/data/zoomTextOnly.qml b/tests/auto/declarative/qmlvisual/webview/zooming/data/zoomTextOnly.qml
index aaa7583..aaa7583 100644
--- a/tests/auto/declarative/visual/webview/zooming/data/zoomTextOnly.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/data/zoomTextOnly.qml
diff --git a/tests/auto/declarative/visual/webview/zooming/data/zooming.0.png b/tests/auto/declarative/qmlvisual/webview/zooming/data/zooming.0.png
index aaab35d..aaab35d 100644
--- a/tests/auto/declarative/visual/webview/zooming/data/zooming.0.png
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/data/zooming.0.png
diff --git a/tests/auto/declarative/visual/webview/zooming/data/zooming.1.png b/tests/auto/declarative/qmlvisual/webview/zooming/data/zooming.1.png
index aaab35d..aaab35d 100644
--- a/tests/auto/declarative/visual/webview/zooming/data/zooming.1.png
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/data/zooming.1.png
diff --git a/tests/auto/declarative/visual/webview/zooming/data/zooming.2.png b/tests/auto/declarative/qmlvisual/webview/zooming/data/zooming.2.png
index aaab35d..aaab35d 100644
--- a/tests/auto/declarative/visual/webview/zooming/data/zooming.2.png
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/data/zooming.2.png
diff --git a/tests/auto/declarative/visual/webview/zooming/data/zooming.3.png b/tests/auto/declarative/qmlvisual/webview/zooming/data/zooming.3.png
index aaab35d..aaab35d 100644
--- a/tests/auto/declarative/visual/webview/zooming/data/zooming.3.png
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/data/zooming.3.png
diff --git a/tests/auto/declarative/visual/webview/zooming/data/zooming.qml b/tests/auto/declarative/qmlvisual/webview/zooming/data/zooming.qml
index ad83800..ad83800 100644
--- a/tests/auto/declarative/visual/webview/zooming/data/zooming.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/data/zooming.qml
diff --git a/tests/auto/declarative/visual/webview/zooming/pageWidth.qml b/tests/auto/declarative/qmlvisual/webview/zooming/pageWidth.qml
index 4a876dd..4a876dd 100644
--- a/tests/auto/declarative/visual/webview/zooming/pageWidth.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/pageWidth.qml
diff --git a/tests/auto/declarative/visual/animation/easing/pics/qtlogo.png b/tests/auto/declarative/qmlvisual/webview/zooming/qtlogo.png
index 399bd0b..399bd0b 100644
--- a/tests/auto/declarative/visual/animation/easing/pics/qtlogo.png
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/qtlogo.png
diff --git a/tests/auto/declarative/visual/webview/zooming/renderControl.html b/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.html
index 1a01a33..1a01a33 100644
--- a/tests/auto/declarative/visual/webview/zooming/renderControl.html
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.html
diff --git a/tests/auto/declarative/visual/webview/zooming/renderControl.qml b/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.qml
index bcbcf5c..52a569e 100644
--- a/tests/auto/declarative/visual/webview/zooming/renderControl.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.qml
@@ -9,7 +9,7 @@ Rectangle {
         id: webview
         width: 400
         url: "renderControl.html"
-        x: SequentialAnimation {
+        SequentialAnimation on x {
                 loops: Animation.Infinite
                 NumberAnimation { from: 100; to: 0; duration: 200 }
                 PropertyAction { target: webview; property: "renderingEnabled"; value: false }
diff --git a/tests/auto/declarative/visual/webview/zooming/resolution.html b/tests/auto/declarative/qmlvisual/webview/zooming/resolution.html
index 75b1e3f..75b1e3f 100644
--- a/tests/auto/declarative/visual/webview/zooming/resolution.html
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/resolution.html
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/resolution.qml b/tests/auto/declarative/qmlvisual/webview/zooming/resolution.qml
new file mode 100644
index 0000000..d6c35d4
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/resolution.qml
@@ -0,0 +1,16 @@
+import Qt 4.6
+import org.webkit 1.0
+
+WebView {
+    width: 200 * zoomFactor
+    height: 250 * zoomFactor
+    scale: 1/zoomFactor
+    url: "resolution.html"
+    SequentialAnimation on zoomFactor {
+        loops: Animation.Infinite
+        NumberAnimation { from: 1; to: 0.25; duration: 2000 }
+        NumberAnimation { from: 0.25; to: 1; duration: 2000 }
+        NumberAnimation { from: 1; to: 5; duration: 2000 }
+        NumberAnimation { from: 5; to: 1; duration: 2000 }
+    }
+}
diff --git a/tests/auto/declarative/visual/webview/zooming/zoomTextOnly.html b/tests/auto/declarative/qmlvisual/webview/zooming/zoomTextOnly.html
index 4997712..4997712 100644
--- a/tests/auto/declarative/visual/webview/zooming/zoomTextOnly.html
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/zoomTextOnly.html
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/zoomTextOnly.qml b/tests/auto/declarative/qmlvisual/webview/zooming/zoomTextOnly.qml
new file mode 100644
index 0000000..741450f
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/zoomTextOnly.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+import org.webkit 1.0
+
+WebView {
+    width: 200
+    height: 250
+    url: "zoomTextOnly.html"
+    settings.zoomTextOnly: true
+    SequentialAnimation on zoomFactor {
+        loops: Animation.Infinite
+        NumberAnimation { from: 2; to: 0.25; duration: 1000 }
+        NumberAnimation { from: 0.25; to: 2; duration: 1000 }
+    }
+}
diff --git a/tests/auto/declarative/visual/webview/zooming/zooming.html b/tests/auto/declarative/qmlvisual/webview/zooming/zooming.html
index 4e91035..4e91035 100644
--- a/tests/auto/declarative/visual/webview/zooming/zooming.html
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/zooming.html
diff --git a/tests/auto/declarative/visual/webview/zooming/zooming.qml b/tests/auto/declarative/qmlvisual/webview/zooming/zooming.qml
index 9f0b865..adbd7a5 100644
--- a/tests/auto/declarative/visual/webview/zooming/zooming.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/zooming.qml
@@ -7,9 +7,9 @@ import org.webkit 1.0
 WebView {
     width: 200
     height: 250
-    x: Behavior { NumberAnimation { } }
-    y: Behavior { NumberAnimation { } }
-    scale: Behavior { NumberAnimation { } }
+    Behavior on x { NumberAnimation { } }
+    Behavior on y { NumberAnimation { } }
+    Behavior on scale { NumberAnimation { } }
     url: "zooming.html"
     preferredWidth: width
     preferredHeight: height
diff --git a/tests/auto/declarative/sql/data/error-creation.js b/tests/auto/declarative/sql/data/error-creation.js
index 92245fd..0ab2a35 100644
--- a/tests/auto/declarative/sql/data/error-creation.js
+++ b/tests/auto/declarative/sql/data/error-creation.js
@@ -3,10 +3,12 @@ function test() {
     try {
         var db = openDatabaseSync("QmlTestDB-creation", "2.0", "Test database from Qt autotests", 1000000);
     } catch (err) {
-        if (err.message == "SQL: database version mismatch")
-            r = "passed";
-        else
+        if (err.code != SQLException.VERSION_ERR)
+            r = "WRONG ERROR CODE="+err.code;
+        else if (err.message != "SQL: database version mismatch")
             r = "WRONG ERROR="+err.message;
+        else
+            r = "passed";
     }
     return r;
 }
diff --git a/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.1.png b/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.1.png
deleted file mode 100644
index f4a6cfd..0000000
--- a/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.1.png
+++ /dev/null
diff --git a/tests/auto/declarative/visual/webview/zooming/resolution.qml b/tests/auto/declarative/visual/webview/zooming/resolution.qml
deleted file mode 100644
index bce6744..0000000
--- a/tests/auto/declarative/visual/webview/zooming/resolution.qml
+++ /dev/null
@@ -1,17 +0,0 @@
-import Qt 4.6
-import org.webkit 1.0
-
-WebView {
-    width: 200 * zoomFactor
-    height: 250 * zoomFactor
-    scale: 1/zoomFactor
-    url: "resolution.html"
-    zoomFactor:
-        SequentialAnimation {
-            loops: Animation.Infinite
-            NumberAnimation { from: 1; to: 0.25; duration: 2000 }
-            NumberAnimation { from: 0.25; to: 1; duration: 2000 }
-            NumberAnimation { from: 1; to: 5; duration: 2000 }
-            NumberAnimation { from: 5; to: 1; duration: 2000 }
-        }
-}
diff --git a/tests/auto/declarative/visual/webview/zooming/zoomTextOnly.qml b/tests/auto/declarative/visual/webview/zooming/zoomTextOnly.qml
deleted file mode 100644
index 6d51c8a..0000000
--- a/tests/auto/declarative/visual/webview/zooming/zoomTextOnly.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import Qt 4.6
-import org.webkit 1.0
-
-WebView {
-    width: 200
-    height: 250
-    url: "zoomTextOnly.html"
-    settings.zoomTextOnly: true
-    zoomFactor:
-        SequentialAnimation {
-            loops: Animation.Infinite
-            NumberAnimation { from: 2; to: 0.25; duration: 1000 }
-            NumberAnimation { from: 0.25; to: 2; duration: 1000 }
-        }
-}
diff --git a/tests/benchmarks/declarative/declarative.pro b/tests/benchmarks/declarative/declarative.pro
index 38ea6c4..a7d426c 100644
--- a/tests/benchmarks/declarative/declarative.pro
+++ b/tests/benchmarks/declarative/declarative.pro
@@ -8,4 +8,4 @@ SUBDIRS += \
            qdeclarativeimage \
            qdeclarativemetaproperty \
            script \
-           qdeclarativetime
+           qmltime
diff --git a/tests/benchmarks/declarative/qdeclarativetime/example.qml b/tests/benchmarks/declarative/qmltime/example.qml
index dd6185d..68889f0 100644
--- a/tests/benchmarks/declarative/qdeclarativetime/example.qml
+++ b/tests/benchmarks/declarative/qmltime/example.qml
@@ -1,11 +1,11 @@
 import Qt 4.6
-import QDeclarativeTime 1.0 as QDeclarativeTime
+import QmlTime 1.0 as QmlTime
 
 Item {
 
     property string name: "Bob Smith"
 
-    QDeclarativeTime.Timer {
+    QmlTime.Timer {
         component: Item {
             Text { text: name }
         }
diff --git a/tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.cpp b/tests/benchmarks/declarative/qmltime/qmltime.cpp
index 20f0d93d..3932e01 100644
--- a/tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.cpp
+++ b/tests/benchmarks/declarative/qmltime/qmltime.cpp
@@ -156,7 +156,7 @@ int main(int argc, char ** argv)
 {
     QApplication app(argc, argv);
 
-    qmlRegisterType<Timer>("QDeclarativeTime", 1, 0, "Timer");
+    qmlRegisterType<Timer>("QmlTime", 1, 0, "Timer");
 
     uint iterations = 1024;
     QString filename;
@@ -228,4 +228,4 @@ int main(int argc, char ** argv)
     return 0;
 }
 
-#include "qdeclarativetime.moc"
+#include "qmltime.moc"
diff --git a/tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.pro b/tests/benchmarks/declarative/qmltime/qmltime.pro
index 7902ee1..9352f3b 100644
--- a/tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.pro
+++ b/tests/benchmarks/declarative/qmltime/qmltime.pro
@@ -1,10 +1,10 @@
 load(qttest_p4)
 TEMPLATE = app
-TARGET = qdeclarativetime
+TARGET = qmltime
 QT += declarative
 macx:CONFIG -= app_bundle
 
-SOURCES += qdeclarativetime.cpp 
+SOURCES += qmltime.cpp 
 
 symbian* {
     TARGET.CAPABILITY = "All -TCB"
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/anchors/empty.qml b/tests/benchmarks/declarative/qmltime/tests/anchors/empty.qml
index 8d93594..31c879b 100644
--- a/tests/benchmarks/declarative/qdeclarativetime/tests/anchors/empty.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/anchors/empty.qml
@@ -1,9 +1,9 @@
 import Qt 4.6
-import QDeclarativeTime 1.0 as QDeclarativeTime
+import QmlTime 1.0 as QmlTime
 
 Item {
 
-    QDeclarativeTime.Timer {
+    QmlTime.Timer {
         component: Component {
             Item {
                 Item {
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/anchors/fill.qml b/tests/benchmarks/declarative/qmltime/tests/anchors/fill.qml
index 918c48a..23fe78e 100644
--- a/tests/benchmarks/declarative/qdeclarativetime/tests/anchors/fill.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/anchors/fill.qml
@@ -1,9 +1,9 @@
 import Qt 4.6
-import QDeclarativeTime 1.0 as QDeclarativeTime
+import QmlTime 1.0 as QmlTime
 
 Item {
 
-    QDeclarativeTime.Timer {
+    QmlTime.Timer {
         component: Component {
             Item {
                 Item {
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/anchors/null.qml b/tests/benchmarks/declarative/qmltime/tests/anchors/null.qml
index bb84538..bc447ef 100644
--- a/tests/benchmarks/declarative/qdeclarativetime/tests/anchors/null.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/anchors/null.qml
@@ -1,9 +1,9 @@
 import Qt 4.6
-import QDeclarativeTime 1.0 as QDeclarativeTime
+import QmlTime 1.0 as QmlTime
 
 Item {
 
-    QDeclarativeTime.Timer {
+    QmlTime.Timer {
         component: Component {
             Item {
                 Item {
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/animation/large.qml b/tests/benchmarks/declarative/qmltime/tests/animation/large.qml
index 978e3bf..c1cdb68 100644
--- a/tests/benchmarks/declarative/qdeclarativetime/tests/animation/large.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/animation/large.qml
@@ -1,9 +1,9 @@
 import Qt 4.6
-import QDeclarativeTime 1.0 as QDeclarativeTime
+import QmlTime 1.0 as QmlTime
 
 Item {
 
-    QDeclarativeTime.Timer {
+    QmlTime.Timer {
         component: Component {
             ParallelAnimation {
                 NumberAnimation { duration: 500 }
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/animation/largeNoProps.qml b/tests/benchmarks/declarative/qmltime/tests/animation/largeNoProps.qml
index cceb3f4..3db9f08 100644
--- a/tests/benchmarks/declarative/qdeclarativetime/tests/animation/largeNoProps.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/animation/largeNoProps.qml
@@ -1,9 +1,9 @@
 import Qt 4.6
-import QDeclarativeTime 1.0 as QDeclarativeTime
+import QmlTime 1.0 as QmlTime
 
 Item {
 
-    QDeclarativeTime.Timer {
+    QmlTime.Timer {
         component: Component {
             ParallelAnimation {
                 NumberAnimation { }
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/children.qml b/tests/benchmarks/declarative/qmltime/tests/item_creation/children.qml
index 3387a32..996602c 100644
--- a/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/children.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/item_creation/children.qml
@@ -1,9 +1,9 @@
 import Qt 4.6
-import QDeclarativeTime 1.0 as QDeclarativeTime
+import QmlTime 1.0 as QmlTime
 
 Item {
 
-    QDeclarativeTime.Timer {
+    QmlTime.Timer {
         component: Component {
             Item {
                 children: [
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/data.qml b/tests/benchmarks/declarative/qmltime/tests/item_creation/data.qml
index a8b653c..9f79c34 100644
--- a/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/data.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/item_creation/data.qml
@@ -1,9 +1,9 @@
 import Qt 4.6
-import QDeclarativeTime 1.0 as QDeclarativeTime
+import QmlTime 1.0 as QmlTime
 
 Item {
 
-    QDeclarativeTime.Timer {
+    QmlTime.Timer {
         component: Component {
             Item {
                 data: [
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/no_creation.qml b/tests/benchmarks/declarative/qmltime/tests/item_creation/no_creation.qml
index 0a507d4..f228c2a 100644
--- a/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/no_creation.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/item_creation/no_creation.qml
@@ -1,9 +1,9 @@
 import Qt 4.6
-import QDeclarativeTime 1.0 as QDeclarativeTime
+import QmlTime 1.0 as QmlTime
 
 Item {
 
-    QDeclarativeTime.Timer {
+    QmlTime.Timer {
         component: Component {
             Item {
             }
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/resources.qml b/tests/benchmarks/declarative/qmltime/tests/item_creation/resources.qml
index 227d8ad..335aeb8 100644
--- a/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/resources.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/item_creation/resources.qml
@@ -1,9 +1,9 @@
 import Qt 4.6
-import QDeclarativeTime 1.0 as QDeclarativeTime
+import QmlTime 1.0 as QmlTime
 
 Item {
 
-    QDeclarativeTime.Timer {
+    QmlTime.Timer {
         component: Component {
             Item {
                 resources: [
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/loader/Loaded.qml b/tests/benchmarks/declarative/qmltime/tests/loader/Loaded.qml
index 6f8d849..6f8d849 100644
--- a/tests/benchmarks/declarative/qdeclarativetime/tests/loader/Loaded.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/loader/Loaded.qml
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/loader/component_loader.qml b/tests/benchmarks/declarative/qmltime/tests/loader/component_loader.qml
index 270add4..65d5010 100644
--- a/tests/benchmarks/declarative/qdeclarativetime/tests/loader/component_loader.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/loader/component_loader.qml
@@ -1,9 +1,9 @@
 import Qt 4.6
-import QDeclarativeTime 1.0 as QDeclarativeTime
+import QmlTime 1.0 as QmlTime
 
 Item {
 
-    QDeclarativeTime.Timer {
+    QmlTime.Timer {
         component: Component {
             Item {
                 Loader {
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/loader/empty_loader.qml b/tests/benchmarks/declarative/qmltime/tests/loader/empty_loader.qml
index d3b84cc..2dfe922 100644
--- a/tests/benchmarks/declarative/qdeclarativetime/tests/loader/empty_loader.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/loader/empty_loader.qml
@@ -1,9 +1,9 @@
 import Qt 4.6
-import QDeclarativeTime 1.0 as QDeclarativeTime
+import QmlTime 1.0 as QmlTime
 
 Item {
 
-    QDeclarativeTime.Timer {
+    QmlTime.Timer {
         component: Component {
             Item {
                 Loader {}
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/loader/no_loader.qml b/tests/benchmarks/declarative/qmltime/tests/loader/no_loader.qml
index a94a12a..1fa0d3b 100644
--- a/tests/benchmarks/declarative/qdeclarativetime/tests/loader/no_loader.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/loader/no_loader.qml
@@ -1,9 +1,9 @@
 import Qt 4.6
-import QDeclarativeTime 1.0 as QDeclarativeTime
+import QmlTime 1.0 as QmlTime
 
 Item {
 
-    QDeclarativeTime.Timer {
+    QmlTime.Timer {
         component: Component {
             Item {
                 Loaded {}
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/loader/source_loader.qml b/tests/benchmarks/declarative/qmltime/tests/loader/source_loader.qml
index 39ed1a6..33bb91c 100644
--- a/tests/benchmarks/declarative/qdeclarativetime/tests/loader/source_loader.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/loader/source_loader.qml
@@ -1,9 +1,9 @@
 import Qt 4.6
-import QDeclarativeTime 1.0 as QDeclarativeTime
+import QmlTime 1.0 as QmlTime
 
 Item {
 
-    QDeclarativeTime.Timer {
+    QmlTime.Timer {
         component: Component {
             Item {
                 Loader {
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/no_positioner.qml b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/no_positioner.qml
index c1f54a4..97bad47 100644
--- a/tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/no_positioner.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/no_positioner.qml
@@ -1,8 +1,8 @@
 import Qt 4.6
-import QDeclarativeTime 1.0 as QDeclarativeTime
+import QmlTime 1.0 as QmlTime
 
 Item {
-    QDeclarativeTime.Timer {
+    QmlTime.Timer {
         component: Component {
             Item {
                 Rectangle { }
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/null_positioner.qml b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/null_positioner.qml
index d49ff78..36dda15 100644
--- a/tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/null_positioner.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/null_positioner.qml
@@ -1,8 +1,8 @@
 import Qt 4.6
-import QDeclarativeTime 1.0 as QDeclarativeTime
+import QmlTime 1.0 as QmlTime
 
 Item {
-    QDeclarativeTime.Timer {
+    QmlTime.Timer {
         component: Component {
             Item {
                 Rectangle { }
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/positioner.qml b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/positioner.qml
index 05ca804..396e27d 100644
--- a/tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/positioner.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/positioner.qml
@@ -1,8 +1,8 @@
 import Qt 4.6
-import QDeclarativeTime 1.0 as QDeclarativeTime
+import QmlTime 1.0 as QmlTime
 
 Item {
-    QDeclarativeTime.Timer {
+    QmlTime.Timer {
         component: Component {
             Item {
                 Rectangle { }
diff --git a/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/null.qml b/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/null.qml
new file mode 100644
index 0000000..a31af5a
--- /dev/null
+++ b/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/null.qml
@@ -0,0 +1,13 @@
+import Qt 4.6
+import QmlTime 1.0 as QmlTime
+
+Item {
+
+    QmlTime.Timer {
+        component: Component {
+            QtObject {
+            }
+        }
+    }
+
+}
diff --git a/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/property.qml b/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/property.qml
new file mode 100644
index 0000000..007d12a
--- /dev/null
+++ b/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/property.qml
@@ -0,0 +1,18 @@
+import Qt 4.6
+import QmlTime 1.0 as QmlTime
+
+Item {
+
+    QmlTime.Timer {
+        component: Component {
+            QtObject {
+                property string s
+                property string s2
+                property string s3
+                property string s4
+            }
+        }
+    }
+
+}
+