From 05c01500d24a0715d65c1c4d1c3e827fdf376126 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Wed, 14 Apr 2010 13:16:44 +1000
Subject: ignore autotester logs

---
 tests/auto/declarative/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/auto/declarative/.gitignore b/tests/auto/declarative/.gitignore
index d937eb4..57608cf 100644
--- a/tests/auto/declarative/.gitignore
+++ b/tests/auto/declarative/.gitignore
@@ -1,4 +1,5 @@
 tst_*
 !tst_*.*
+tst_*.log
 tst_*.debug
 tst_*~
-- 
cgit v0.12


From fa93b3fb3956f77f36c520e41b0c5065e51a56ce Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Wed, 14 Apr 2010 14:38:28 +1000
Subject: Should work now, don't skip.

---
 .../qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp            | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
index 26199d3..6d17acc 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
@@ -101,7 +101,6 @@ inline QUrl TEST_FILE(const QString &filename)
 
 void tst_qdeclarativemoduleplugin::importsPlugin()
 {
-QSKIP("Fix me", SkipAll);
     QDeclarativeEngine engine;
     engine.addImportPath(QLatin1String(SRCDIR) + QDir::separator() + QLatin1String("imports"));
     QTest::ignoreMessage(QtWarningMsg, "plugin created");
-- 
cgit v0.12


From 35afac3d3a275aa69c74e174cfeb5e411816e94a Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Wed, 14 Apr 2010 14:53:13 +1000
Subject: Rename "sql" test so autotester doesn't get confused.

---
 tests/auto/declarative/declarative.pro             |   2 +-
 .../qdeclarativesqldatabase/data/README            |   3 +
 .../qdeclarativesqldatabase/data/changeversion.js  |  53 +++++
 .../qdeclarativesqldatabase/data/creation-a.js     |  18 ++
 .../qdeclarativesqldatabase/data/creation.js       |  14 ++
 .../qdeclarativesqldatabase/data/error-a.js        |  20 ++
 .../qdeclarativesqldatabase/data/error-b.js        |  13 ++
 .../qdeclarativesqldatabase/data/error-creation.js |  14 ++
 .../data/error-notransaction.js                    |  15 ++
 .../data/error-outsidetransaction.js               |  17 ++
 .../data/iteration-forwardonly.js                  |  29 +++
 .../qdeclarativesqldatabase/data/iteration.js      |  28 +++
 .../qdeclarativesqldatabase/data/readonly-error.js |  27 +++
 .../qdeclarativesqldatabase/data/readonly.js       |  24 +++
 .../qdeclarativesqldatabase/data/reopen1.js        |  14 ++
 .../qdeclarativesqldatabase/data/reopen2.js        |  16 ++
 .../data/selection-bindnames.js                    |  26 +++
 .../qdeclarativesqldatabase/data/selection.js      |  26 +++
 .../qdeclarativesqldatabase.pro                    |  12 ++
 .../tst_qdeclarativesqldatabase.cpp                | 239 +++++++++++++++++++++
 tests/auto/declarative/sql/data/README             |   3 -
 tests/auto/declarative/sql/data/changeversion.js   |  53 -----
 tests/auto/declarative/sql/data/creation-a.js      |  18 --
 tests/auto/declarative/sql/data/creation.js        |  14 --
 tests/auto/declarative/sql/data/error-a.js         |  20 --
 tests/auto/declarative/sql/data/error-b.js         |  13 --
 tests/auto/declarative/sql/data/error-creation.js  |  14 --
 .../declarative/sql/data/error-notransaction.js    |  15 --
 .../sql/data/error-outsidetransaction.js           |  17 --
 .../declarative/sql/data/iteration-forwardonly.js  |  29 ---
 tests/auto/declarative/sql/data/iteration.js       |  28 ---
 tests/auto/declarative/sql/data/readonly-error.js  |  27 ---
 tests/auto/declarative/sql/data/readonly.js        |  24 ---
 tests/auto/declarative/sql/data/reopen1.js         |  14 --
 tests/auto/declarative/sql/data/reopen2.js         |  16 --
 .../declarative/sql/data/selection-bindnames.js    |  26 ---
 tests/auto/declarative/sql/data/selection.js       |  26 ---
 tests/auto/declarative/sql/sql.pro                 |  12 --
 tests/auto/declarative/sql/tst_sql.cpp             | 239 ---------------------
 39 files changed, 609 insertions(+), 609 deletions(-)
 create mode 100644 tests/auto/declarative/qdeclarativesqldatabase/data/README
 create mode 100644 tests/auto/declarative/qdeclarativesqldatabase/data/changeversion.js
 create mode 100644 tests/auto/declarative/qdeclarativesqldatabase/data/creation-a.js
 create mode 100644 tests/auto/declarative/qdeclarativesqldatabase/data/creation.js
 create mode 100644 tests/auto/declarative/qdeclarativesqldatabase/data/error-a.js
 create mode 100644 tests/auto/declarative/qdeclarativesqldatabase/data/error-b.js
 create mode 100644 tests/auto/declarative/qdeclarativesqldatabase/data/error-creation.js
 create mode 100644 tests/auto/declarative/qdeclarativesqldatabase/data/error-notransaction.js
 create mode 100644 tests/auto/declarative/qdeclarativesqldatabase/data/error-outsidetransaction.js
 create mode 100644 tests/auto/declarative/qdeclarativesqldatabase/data/iteration-forwardonly.js
 create mode 100644 tests/auto/declarative/qdeclarativesqldatabase/data/iteration.js
 create mode 100644 tests/auto/declarative/qdeclarativesqldatabase/data/readonly-error.js
 create mode 100644 tests/auto/declarative/qdeclarativesqldatabase/data/readonly.js
 create mode 100644 tests/auto/declarative/qdeclarativesqldatabase/data/reopen1.js
 create mode 100644 tests/auto/declarative/qdeclarativesqldatabase/data/reopen2.js
 create mode 100644 tests/auto/declarative/qdeclarativesqldatabase/data/selection-bindnames.js
 create mode 100644 tests/auto/declarative/qdeclarativesqldatabase/data/selection.js
 create mode 100644 tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro
 create mode 100644 tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp
 delete mode 100644 tests/auto/declarative/sql/data/README
 delete mode 100644 tests/auto/declarative/sql/data/changeversion.js
 delete mode 100644 tests/auto/declarative/sql/data/creation-a.js
 delete mode 100644 tests/auto/declarative/sql/data/creation.js
 delete mode 100644 tests/auto/declarative/sql/data/error-a.js
 delete mode 100644 tests/auto/declarative/sql/data/error-b.js
 delete mode 100644 tests/auto/declarative/sql/data/error-creation.js
 delete mode 100644 tests/auto/declarative/sql/data/error-notransaction.js
 delete mode 100644 tests/auto/declarative/sql/data/error-outsidetransaction.js
 delete mode 100644 tests/auto/declarative/sql/data/iteration-forwardonly.js
 delete mode 100644 tests/auto/declarative/sql/data/iteration.js
 delete mode 100644 tests/auto/declarative/sql/data/readonly-error.js
 delete mode 100644 tests/auto/declarative/sql/data/readonly.js
 delete mode 100644 tests/auto/declarative/sql/data/reopen1.js
 delete mode 100644 tests/auto/declarative/sql/data/reopen2.js
 delete mode 100644 tests/auto/declarative/sql/data/selection-bindnames.js
 delete mode 100644 tests/auto/declarative/sql/data/selection.js
 delete mode 100644 tests/auto/declarative/sql/sql.pro
 delete mode 100644 tests/auto/declarative/sql/tst_sql.cpp

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 5441311..7834650 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -62,7 +62,7 @@ SUBDIRS += \
            qdeclarativexmlhttprequest \      # Cover
            qdeclarativeimageprovider \       # Cover
            qdeclarativestyledtext \          # Cover
-           sql \                      # Cover
+           qdeclarativesqldatabase \         # Cover
            qmlvisual                    # Cover
 
 contains(QT_CONFIG, webkit) {
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/README b/tests/auto/declarative/qdeclarativesqldatabase/data/README
new file mode 100644
index 0000000..7efca3a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/README
@@ -0,0 +1,3 @@
+These tests are executed in sequence - the database persist until the end of the
+testing. This is done to better exercise the persistence of the database, since
+that is how it is used.
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/changeversion.js b/tests/auto/declarative/qdeclarativesqldatabase/data/changeversion.js
new file mode 100644
index 0000000..680d7a6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/changeversion.js
@@ -0,0 +1,53 @@
+function test() {
+    var r="transaction_not_finished";
+
+    var db = openDatabaseSync("QmlTestDB-changeversion", "", "Test database from Qt autotests", 1000000,
+            function(db) {
+                db.changeVersion("","1.0")
+                db.transaction(function(tx){
+                    tx.executeSql('CREATE TABLE Greeting(salutation TEXT, salutee TEXT)');
+                })
+            });
+
+    db.transaction(function(tx){
+        tx.executeSql('INSERT INTO Greeting VALUES ("Hello", "world")');
+        tx.executeSql('INSERT INTO Greeting VALUES ("Goodbye", "cruel world")');
+    });
+
+
+    db = openDatabaseSync("QmlTestDB-changeversion", "", "Test database from Qt autotests", 1000000);
+
+    if (db.version == "1.0")
+        db.changeVersion("1.0","2.0",function(tx)
+            {
+                tx.executeSql('CREATE TABLE Utterance(type TEXT, phrase TEXT)')
+                var rs = tx.executeSql('SELECT * FROM Greeting');
+                for (var i=0; i<rs.rows.length; ++i) {
+                    var type = "Greeting";
+                    var phrase = rs.rows.item(i).salutation + ", " + rs.rows.item(i).salutee;
+                    if (rs.rows.item(i).salutation == "Goodbye"
+                     || rs.rows.item(i).salutation == "Farewell"
+                     || rs.rows.item(i).salutation == "Good-bye") type = "Valediction";
+                    var ins = tx.executeSql('INSERT INTO Utterance VALUES(?,?)',[type,phrase]);
+                }
+                tx.executeSql('DROP TABLE Greeting');
+            });
+    else
+        return "db.version should be 1.0, but is " + db.version;
+
+    var db = openDatabaseSync("QmlTestDB-changeversion", "2.0", "Test database from Qt autotests", 1000000);
+
+    db.transaction(function(tx){
+        var rs = tx.executeSql('SELECT * FROM Utterance');
+        r = ""
+        for (var i=0; i<rs.rows.length; ++i) {
+            r += "(" + rs.rows.item(i).type + ": " + rs.rows.item(i).phrase + ")";
+        }
+        if (r == "(Greeting: Hello, world)(Valediction: Goodbye, cruel world)")
+            r = "passed"
+        else
+            r = "WRONG DATA: " + r;
+    })
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/creation-a.js b/tests/auto/declarative/qdeclarativesqldatabase/data/creation-a.js
new file mode 100644
index 0000000..bd7d5c5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/creation-a.js
@@ -0,0 +1,18 @@
+function test() {
+    var r="transaction_not_finished";
+
+    var db = openDatabaseSync("QmlTestDB-creation-a", "1.0", "Test database from Qt autotests", 1000000,
+            function(db) {
+                db.transaction(function(tx){
+                    tx.executeSql('CREATE TABLE Greeting(salutation TEXT, salutee TEXT)');
+                    r = "passed";
+                })
+            });
+
+    var db = openDatabaseSync("QmlTestDB-creation-a", "1.0", "Test database from Qt autotests", 1000000,
+            function(db) {
+                r = "FAILED: should have already been created";
+            });
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/creation.js b/tests/auto/declarative/qdeclarativesqldatabase/data/creation.js
new file mode 100644
index 0000000..317b4c1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/creation.js
@@ -0,0 +1,14 @@
+function test() {
+    var r="transaction_not_finished";
+    var db = openDatabaseSync("QmlTestDB-creation", "1.0", "Test database from Qt autotests", 1000000);
+
+    db.transaction(
+        function(tx) {
+            tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)');
+            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+            r = "passed";
+        }
+    );
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/error-a.js b/tests/auto/declarative/qdeclarativesqldatabase/data/error-a.js
new file mode 100644
index 0000000..10a23f6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/error-a.js
@@ -0,0 +1,20 @@
+function test() {
+    var db = openDatabaseSync("QmlTestDB-error-a", "1.0", "Test database from Qt autotests", 1000000);
+    var r="transaction_not_finished";
+
+    try {
+        db.transaction(
+            function(tx) {
+                var rs = tx.executeSql('SELECT * FROM NotExists');
+                r = "SHOULD NOT SUCCEED";
+            }
+        );
+    } catch (err) {
+        if (err.message == "no such table: NotExists Unable to execute statement")
+            r = "passed";
+        else
+            r = "WRONG ERROR="+err.message;
+    }
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/error-b.js b/tests/auto/declarative/qdeclarativesqldatabase/data/error-b.js
new file mode 100644
index 0000000..4dd0ecf
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/error-b.js
@@ -0,0 +1,13 @@
+function test() {
+    var db = openDatabaseSync("QmlTestDB-error-b", "1.0", "Test database from Qt autotests", 1000000);
+    var r="transaction_not_finished";
+
+    db.transaction(
+        function(tx) {
+            tx.executeSql('INSERT INTO Greeting VALUES("junk","junk")');
+            notexist[123] = "oops"
+        }
+    );
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/error-creation.js b/tests/auto/declarative/qdeclarativesqldatabase/data/error-creation.js
new file mode 100644
index 0000000..0ab2a35
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/error-creation.js
@@ -0,0 +1,14 @@
+function test() {
+    var r="transaction_not_finished";
+    try {
+        var db = openDatabaseSync("QmlTestDB-creation", "2.0", "Test database from Qt autotests", 1000000);
+    } catch (err) {
+        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/qdeclarativesqldatabase/data/error-notransaction.js b/tests/auto/declarative/qdeclarativesqldatabase/data/error-notransaction.js
new file mode 100644
index 0000000..b9cc647
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/error-notransaction.js
@@ -0,0 +1,15 @@
+function test() {
+    var db = openDatabaseSync("QmlTestDB-data/error-notransaction", "1.0", "Test database from Qt autotests", 1000000);
+    var r="transaction_not_finished";
+
+    try {
+        db.transaction();
+    } catch (err) {
+        if (err.message == "transaction: missing callback")
+            r = "passed";
+        else
+            r = "WRONG ERROR="+err.message;
+    }
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/error-outsidetransaction.js b/tests/auto/declarative/qdeclarativesqldatabase/data/error-outsidetransaction.js
new file mode 100644
index 0000000..a7af3bd
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/error-outsidetransaction.js
@@ -0,0 +1,17 @@
+function test() {
+    var db = openDatabaseSync("QmlTestDB-data/error-notransaction", "1.0", "Test database from Qt autotests", 1000000);
+    var r="transaction_not_finished";
+    var v;
+
+    try {
+        db.transaction(function(tx) { v = tx });
+        v.executeSql("SELECT 'bad'")
+    } catch (err) {
+        if (err.message == "executeSql called outside transaction()")
+            r = "passed";
+        else
+            r = "WRONG ERROR="+err.message;
+    }
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/iteration-forwardonly.js b/tests/auto/declarative/qdeclarativesqldatabase/data/iteration-forwardonly.js
new file mode 100644
index 0000000..45947c0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/iteration-forwardonly.js
@@ -0,0 +1,29 @@
+function test() {
+    var db = openDatabaseSync("QmlTestDB-iteration-forwardonly", "", "Test database from Qt autotests", 1000000);
+    var r="transaction_not_finished";
+
+    db.transaction(
+        function(tx) {
+            tx.executeSql('CREATE TABLE Greeting(salutation TEXT, salutee TEXT)');
+            tx.executeSql('INSERT INTO Greeting VALUES ("Hello", "world")');
+            tx.executeSql('INSERT INTO Greeting VALUES ("Goodbye", "cruel world")');
+        }
+    )
+
+    db.transaction(
+        function(tx) {
+            var rs = tx.executeSql('SELECT * FROM Greeting');
+            rs.forwardOnly = !rs.forwardOnly
+            var r1=""
+            for(var i = 0; i < rs.rows.length; i++)
+                r1 += rs.rows.item(i).salutation + ", " + rs.rows.item(i).salutee + ";"
+            if (r1 != "hello, world;hello, world;hello, world;hello, world;")
+            if (r1 != "Hello, world;Goodbye, cruel world;")
+                r = "SELECTED DATA WRONG: "+r1;
+            else
+                r = "passed";
+        }
+    );
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/iteration.js b/tests/auto/declarative/qdeclarativesqldatabase/data/iteration.js
new file mode 100644
index 0000000..c34cbbb
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/iteration.js
@@ -0,0 +1,28 @@
+function test() {
+    var db = openDatabaseSync("QmlTestDB-iteration", "", "Test database from Qt autotests", 1000000);
+    var r="transaction_not_finished";
+
+    db.transaction(
+        function(tx) {
+            tx.executeSql('CREATE TABLE Greeting(salutation TEXT, salutee TEXT)');
+            tx.executeSql('INSERT INTO Greeting VALUES ("Hello", "world")');
+            tx.executeSql('INSERT INTO Greeting VALUES ("Goodbye", "cruel world")');
+        }
+    )
+
+    db.transaction(
+        function(tx) {
+            var rs = tx.executeSql('SELECT * FROM Greeting');
+            var r1=""
+            for(var i = 0; i < rs.rows.length; i++)
+                r1 += rs.rows.item(i).salutation + ", " + rs.rows.item(i).salutee + ";"
+            if (r1 != "hello, world;hello, world;hello, world;hello, world;")
+            if (r1 != "Hello, world;Goodbye, cruel world;")
+                r = "SELECTED DATA WRONG: "+r1;
+            else
+                r = "passed";
+        }
+    );
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/readonly-error.js b/tests/auto/declarative/qdeclarativesqldatabase/data/readonly-error.js
new file mode 100644
index 0000000..69ec67f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/readonly-error.js
@@ -0,0 +1,27 @@
+function test() {
+    var r="transaction_not_finished";
+    var db = openDatabaseSync("QmlTestDB-readonly-error", "1.0", "Test database from Qt autotests", 1000000);
+
+    db.transaction(
+        function(tx) {
+            tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)');
+            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+        }
+    );
+
+    try {
+        db.readTransaction(
+            function(tx) {
+                tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+                r = "FAILED";
+            }
+        );
+    } catch (err) {
+        if (err.message == "Read-only Transaction")
+            r = "passed";
+        else
+            r = "WRONG ERROR="+err.message;
+    }
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/readonly.js b/tests/auto/declarative/qdeclarativesqldatabase/data/readonly.js
new file mode 100644
index 0000000..5ee862c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/readonly.js
@@ -0,0 +1,24 @@
+function test() {
+    var r="transaction_not_finished";
+    var db = openDatabaseSync("QmlTestDB-readonly", "1.0", "Test database from Qt autotests", 1000000);
+
+    db.transaction(
+        function(tx) {
+            tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)');
+            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+            r = "passed";
+        }
+    );
+
+    db.readTransaction(
+        function(tx) {
+            var rs = tx.executeSql('SELECT * FROM Greeting');
+            if (rs.rows.item(0).salutation == 'hello')
+                r = "passed";
+            else
+                r = "FAILED";
+        }
+    );
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/reopen1.js b/tests/auto/declarative/qdeclarativesqldatabase/data/reopen1.js
new file mode 100644
index 0000000..c1a8157
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/reopen1.js
@@ -0,0 +1,14 @@
+function test() {
+    var r="transaction_not_finished";
+    var db = openDatabaseSync("QmlTestDB-reopen", "1.0", "Test database from Qt autotests", 1000000);
+
+    db.transaction(
+        function(tx) {
+            tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)');
+            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+            r = "passed";
+        }
+    );
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/reopen2.js b/tests/auto/declarative/qdeclarativesqldatabase/data/reopen2.js
new file mode 100644
index 0000000..4f7248f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/reopen2.js
@@ -0,0 +1,16 @@
+function test() {
+    var r="transaction_not_finished";
+    var db = openDatabaseSync("QmlTestDB-reopen", "1.0", "Test database from Qt autotests", 1000000);
+
+    db.transaction(
+        function(tx) {
+            var rs = tx.executeSql('SELECT * FROM Greeting');
+            if (rs.rows.item(0).salutation == 'hello')
+                r = "passed";
+            else
+                r = "FAILED";
+        }
+    );
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/selection-bindnames.js b/tests/auto/declarative/qdeclarativesqldatabase/data/selection-bindnames.js
new file mode 100644
index 0000000..9786821
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/selection-bindnames.js
@@ -0,0 +1,26 @@
+function test() {
+    var db = openDatabaseSync("QmlTestDB-bindnames", "", "Test database from Qt autotests", 1000000);
+    var r="transaction_not_finished";
+
+    db.transaction(
+        function(tx) {
+            tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)');
+            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'goodbye', 'world' ]);
+            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'there' ]);
+        }
+    );
+
+    db.transaction(
+        function(tx) {
+            var rs = tx.executeSql('SELECT * FROM Greeting WHERE salutation=:p2 AND salutee=:p1', {':p1':'world', ':p2':'hello'});
+            if ( rs.rows.length != 2 )
+                r = "SELECT RETURNED WRONG VALUE "+rs.rows.length+rs.rows.item(0)+rs.rows.item(1)
+            else
+                r = "passed";
+        }
+    );
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/selection.js b/tests/auto/declarative/qdeclarativesqldatabase/data/selection.js
new file mode 100644
index 0000000..f116eff
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/selection.js
@@ -0,0 +1,26 @@
+function test() {
+    var db = openDatabaseSync("QmlTestDB-selection", "", "Test database from Qt autotests", 1000000);
+    var r="transaction_not_finished";
+
+    db.transaction(
+        function(tx) {
+            tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)');
+            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+        }
+    );
+
+    db.transaction(
+        function(tx) {
+            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+            var rs = tx.executeSql('SELECT * FROM Greeting');
+            if ( rs.rows.length != 4 )
+                r = "SELECT RETURNED WRONG VALUE "+rs.rows.length+rs.rows[0]+rs.rows[1]
+            else
+                r = "passed";
+        }
+    );
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro
new file mode 100644
index 0000000..3ff4529
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro
@@ -0,0 +1,12 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+QT += sql script
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativesqldatabase.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+
+CONFIG += parallel_test
+
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp b/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp
new file mode 100644
index 0000000..7486a4b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp
@@ -0,0 +1,239 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include "../../../shared/util.h"
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativetext_p.h>
+#include <private/qdeclarativeengine_p.h>
+#include <QtCore/qcryptographichash.h>
+#include <QtWebKit/qwebpage.h>
+#include <QtWebKit/qwebframe.h>
+#include <QtWebKit/qwebdatabase.h>
+#include <QtWebKit/qwebsecurityorigin.h>
+#include <QtSql/qsqldatabase.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qfile.h>
+
+class tst_qdeclarativesqldatabase : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qdeclarativesqldatabase()
+    {
+        qApp->setApplicationName("tst_qdeclarativesqldatabase");
+        qApp->setOrganizationName("Nokia");
+        qApp->setOrganizationDomain("nokia.com");
+        engine = new QDeclarativeEngine;
+    }
+
+    ~tst_qdeclarativesqldatabase()
+    {
+        delete engine;
+    }
+
+private slots:
+    void initTestCase();
+
+    void checkDatabasePath();
+
+    void testQml_data();
+    void testQml();
+    void testQml_cleanopen_data();
+    void testQml_cleanopen();
+    void totalDatabases();
+
+    void cleanupTestCase();
+
+private:
+    QString dbDir() const;
+    QDeclarativeEngine *engine;
+};
+
+class QWebPageWithJavaScriptConsoleMessages : public QWebPage {
+public:
+    void javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID)
+    {
+        qWarning() << sourceID << ":" << lineNumber << ":" << message;
+    }
+};
+
+void removeRecursive(const QString& dirname)
+{
+    QDir dir(dirname);
+    QFileInfoList entries(dir.entryInfoList(QDir::Dirs|QDir::Files|QDir::NoDotAndDotDot));
+    for (int i = 0; i < entries.count(); ++i)
+        if (entries[i].isDir())
+            removeRecursive(entries[i].filePath());
+        else
+            dir.remove(entries[i].fileName());
+    QDir().rmdir(dirname);
+}
+
+void tst_qdeclarativesqldatabase::initTestCase()
+{
+    removeRecursive(dbDir());
+    QDir().mkpath(dbDir());
+}
+
+void tst_qdeclarativesqldatabase::cleanupTestCase()
+{
+    removeRecursive(dbDir());
+}
+
+QString tst_qdeclarativesqldatabase::dbDir() const
+{
+    static QString tmpd = QDir::tempPath()+"/tst_qdeclarativesqldatabase_output-"
+        + QDateTime::currentDateTime().toString(QLatin1String("yyyyMMddhhmmss"));
+    return tmpd;
+}
+
+void tst_qdeclarativesqldatabase::checkDatabasePath()
+{
+    // Check default storage path (we can't use it since we don't want to mess with user's data)
+    QVERIFY(engine->offlineStoragePath().contains("tst_qdeclarativesqldatabase"));
+    QVERIFY(engine->offlineStoragePath().contains("OfflineStorage"));
+}
+
+static const int total_databases_created_by_tests = 12;
+void tst_qdeclarativesqldatabase::testQml_data()
+{
+    QTest::addColumn<QString>("jsfile"); // The input file
+
+    // Each test should use a newly named DB to avoid inter-test dependencies
+    QTest::newRow("creation") << "data/creation.js";
+    QTest::newRow("creation-a") << "data/creation-a.js";
+    QTest::newRow("creation") << "data/creation.js";
+    QTest::newRow("error-creation") << "data/error-creation.js"; // re-uses above DB
+    QTest::newRow("changeversion") << "data/changeversion.js";
+    QTest::newRow("readonly") << "data/readonly.js";
+    QTest::newRow("readonly-error") << "data/readonly-error.js";
+    QTest::newRow("selection") << "data/selection.js";
+    QTest::newRow("selection-bindnames") << "data/selection-bindnames.js";
+    QTest::newRow("iteration") << "data/iteration.js";
+    QTest::newRow("iteration-forwardonly") << "data/iteration-forwardonly.js";
+    QTest::newRow("error-a") << "data/error-a.js";
+    QTest::newRow("error-notransaction") << "data/error-notransaction.js";
+    QTest::newRow("error-outsidetransaction") << "data/error-outsidetransaction.js"; // reuse above
+    QTest::newRow("reopen1") << "data/reopen1.js";
+    QTest::newRow("reopen2") << "data/reopen2.js"; // re-uses above DB
+
+    // If you add a test, you should usually use a new database in the
+    // test - in which case increment total_databases_created_by_tests above.
+}
+
+/*
+void tst_qdeclarativesqldatabase::validateAgainstWebkit()
+{
+    // Validates tests against WebKit (HTML5) support.
+    //
+    QFETCH(QString, jsfile);
+    QFETCH(QString, result);
+    QFETCH(int, databases);
+
+    QFile f(jsfile);
+    QVERIFY(f.open(QIODevice::ReadOnly));
+    QString js=f.readAll();
+
+    QWebPageWithJavaScriptConsoleMessages webpage;
+    webpage.settings()->setOfflineStoragePath(dbDir());
+    webpage.settings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, true);
+
+    QEXPECT_FAIL("","WebKit doesn't support openDatabaseSync yet", Continue);
+    QCOMPARE(webpage.mainFrame()->evaluateJavaScript(js).toString(),result);
+
+    QTest::qWait(100); // WebKit crashes if you quit it too fast
+
+    QWebSecurityOrigin origin = webpage.mainFrame()->securityOrigin();
+    QList<QWebDatabase> dbs = origin.databases();
+    QCOMPARE(dbs.count(), databases);
+}
+*/
+
+void tst_qdeclarativesqldatabase::testQml()
+{
+    // Tests QML SQL Database support with tests
+    // that have been validated against Webkit.
+    //
+    QFETCH(QString, jsfile);
+
+    QString qml=
+        "import Qt 4.7\n"
+        "import \""+jsfile+"\" as JS\n"
+        "Text { text: JS.test() }";
+
+    engine->setOfflineStoragePath(dbDir());
+    QDeclarativeComponent component(engine);
+    component.setData(qml.toUtf8(), QUrl::fromLocalFile(SRCDIR "/empty.qml")); // just a file for relative local imports
+    QVERIFY(!component.isError());
+    QDeclarativeText *text = qobject_cast<QDeclarativeText*>(component.create());
+    QVERIFY(text != 0);
+    QCOMPARE(text->text(),QString("passed"));
+}
+
+void tst_qdeclarativesqldatabase::testQml_cleanopen_data()
+{
+    QTest::addColumn<QString>("jsfile"); // The input file
+    QTest::newRow("reopen1") << "data/reopen1.js";
+    QTest::newRow("reopen2") << "data/reopen2.js";
+    QTest::newRow("error-creation") << "data/error-creation.js"; // re-uses creation DB
+}
+
+void tst_qdeclarativesqldatabase::testQml_cleanopen()
+{
+    // Same as testQml, but clean connections between tests,
+    // making it more like the tests are running in new processes.
+    testQml();
+
+    QDeclarativeEnginePrivate::getScriptEngine(engine)->collectGarbage(); // close databases
+    foreach (QString dbname, QSqlDatabase::connectionNames()) {
+        QSqlDatabase::removeDatabase(dbname);
+    }
+}
+
+void tst_qdeclarativesqldatabase::totalDatabases()
+{
+    QCOMPARE(QDir(dbDir()+"/Databases").entryInfoList(QDir::Files|QDir::NoDotAndDotDot).count(), total_databases_created_by_tests*2);
+}
+
+QTEST_MAIN(tst_qdeclarativesqldatabase)
+
+#include "tst_qdeclarativesqldatabase.moc"
diff --git a/tests/auto/declarative/sql/data/README b/tests/auto/declarative/sql/data/README
deleted file mode 100644
index 7efca3a..0000000
--- a/tests/auto/declarative/sql/data/README
+++ /dev/null
@@ -1,3 +0,0 @@
-These tests are executed in sequence - the database persist until the end of the
-testing. This is done to better exercise the persistence of the database, since
-that is how it is used.
diff --git a/tests/auto/declarative/sql/data/changeversion.js b/tests/auto/declarative/sql/data/changeversion.js
deleted file mode 100644
index 680d7a6..0000000
--- a/tests/auto/declarative/sql/data/changeversion.js
+++ /dev/null
@@ -1,53 +0,0 @@
-function test() {
-    var r="transaction_not_finished";
-
-    var db = openDatabaseSync("QmlTestDB-changeversion", "", "Test database from Qt autotests", 1000000,
-            function(db) {
-                db.changeVersion("","1.0")
-                db.transaction(function(tx){
-                    tx.executeSql('CREATE TABLE Greeting(salutation TEXT, salutee TEXT)');
-                })
-            });
-
-    db.transaction(function(tx){
-        tx.executeSql('INSERT INTO Greeting VALUES ("Hello", "world")');
-        tx.executeSql('INSERT INTO Greeting VALUES ("Goodbye", "cruel world")');
-    });
-
-
-    db = openDatabaseSync("QmlTestDB-changeversion", "", "Test database from Qt autotests", 1000000);
-
-    if (db.version == "1.0")
-        db.changeVersion("1.0","2.0",function(tx)
-            {
-                tx.executeSql('CREATE TABLE Utterance(type TEXT, phrase TEXT)')
-                var rs = tx.executeSql('SELECT * FROM Greeting');
-                for (var i=0; i<rs.rows.length; ++i) {
-                    var type = "Greeting";
-                    var phrase = rs.rows.item(i).salutation + ", " + rs.rows.item(i).salutee;
-                    if (rs.rows.item(i).salutation == "Goodbye"
-                     || rs.rows.item(i).salutation == "Farewell"
-                     || rs.rows.item(i).salutation == "Good-bye") type = "Valediction";
-                    var ins = tx.executeSql('INSERT INTO Utterance VALUES(?,?)',[type,phrase]);
-                }
-                tx.executeSql('DROP TABLE Greeting');
-            });
-    else
-        return "db.version should be 1.0, but is " + db.version;
-
-    var db = openDatabaseSync("QmlTestDB-changeversion", "2.0", "Test database from Qt autotests", 1000000);
-
-    db.transaction(function(tx){
-        var rs = tx.executeSql('SELECT * FROM Utterance');
-        r = ""
-        for (var i=0; i<rs.rows.length; ++i) {
-            r += "(" + rs.rows.item(i).type + ": " + rs.rows.item(i).phrase + ")";
-        }
-        if (r == "(Greeting: Hello, world)(Valediction: Goodbye, cruel world)")
-            r = "passed"
-        else
-            r = "WRONG DATA: " + r;
-    })
-
-    return r;
-}
diff --git a/tests/auto/declarative/sql/data/creation-a.js b/tests/auto/declarative/sql/data/creation-a.js
deleted file mode 100644
index bd7d5c5..0000000
--- a/tests/auto/declarative/sql/data/creation-a.js
+++ /dev/null
@@ -1,18 +0,0 @@
-function test() {
-    var r="transaction_not_finished";
-
-    var db = openDatabaseSync("QmlTestDB-creation-a", "1.0", "Test database from Qt autotests", 1000000,
-            function(db) {
-                db.transaction(function(tx){
-                    tx.executeSql('CREATE TABLE Greeting(salutation TEXT, salutee TEXT)');
-                    r = "passed";
-                })
-            });
-
-    var db = openDatabaseSync("QmlTestDB-creation-a", "1.0", "Test database from Qt autotests", 1000000,
-            function(db) {
-                r = "FAILED: should have already been created";
-            });
-
-    return r;
-}
diff --git a/tests/auto/declarative/sql/data/creation.js b/tests/auto/declarative/sql/data/creation.js
deleted file mode 100644
index 317b4c1..0000000
--- a/tests/auto/declarative/sql/data/creation.js
+++ /dev/null
@@ -1,14 +0,0 @@
-function test() {
-    var r="transaction_not_finished";
-    var db = openDatabaseSync("QmlTestDB-creation", "1.0", "Test database from Qt autotests", 1000000);
-
-    db.transaction(
-        function(tx) {
-            tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)');
-            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
-            r = "passed";
-        }
-    );
-
-    return r;
-}
diff --git a/tests/auto/declarative/sql/data/error-a.js b/tests/auto/declarative/sql/data/error-a.js
deleted file mode 100644
index 10a23f6..0000000
--- a/tests/auto/declarative/sql/data/error-a.js
+++ /dev/null
@@ -1,20 +0,0 @@
-function test() {
-    var db = openDatabaseSync("QmlTestDB-error-a", "1.0", "Test database from Qt autotests", 1000000);
-    var r="transaction_not_finished";
-
-    try {
-        db.transaction(
-            function(tx) {
-                var rs = tx.executeSql('SELECT * FROM NotExists');
-                r = "SHOULD NOT SUCCEED";
-            }
-        );
-    } catch (err) {
-        if (err.message == "no such table: NotExists Unable to execute statement")
-            r = "passed";
-        else
-            r = "WRONG ERROR="+err.message;
-    }
-
-    return r;
-}
diff --git a/tests/auto/declarative/sql/data/error-b.js b/tests/auto/declarative/sql/data/error-b.js
deleted file mode 100644
index 4dd0ecf..0000000
--- a/tests/auto/declarative/sql/data/error-b.js
+++ /dev/null
@@ -1,13 +0,0 @@
-function test() {
-    var db = openDatabaseSync("QmlTestDB-error-b", "1.0", "Test database from Qt autotests", 1000000);
-    var r="transaction_not_finished";
-
-    db.transaction(
-        function(tx) {
-            tx.executeSql('INSERT INTO Greeting VALUES("junk","junk")');
-            notexist[123] = "oops"
-        }
-    );
-
-    return r;
-}
diff --git a/tests/auto/declarative/sql/data/error-creation.js b/tests/auto/declarative/sql/data/error-creation.js
deleted file mode 100644
index 0ab2a35..0000000
--- a/tests/auto/declarative/sql/data/error-creation.js
+++ /dev/null
@@ -1,14 +0,0 @@
-function test() {
-    var r="transaction_not_finished";
-    try {
-        var db = openDatabaseSync("QmlTestDB-creation", "2.0", "Test database from Qt autotests", 1000000);
-    } catch (err) {
-        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/sql/data/error-notransaction.js b/tests/auto/declarative/sql/data/error-notransaction.js
deleted file mode 100644
index b9cc647..0000000
--- a/tests/auto/declarative/sql/data/error-notransaction.js
+++ /dev/null
@@ -1,15 +0,0 @@
-function test() {
-    var db = openDatabaseSync("QmlTestDB-data/error-notransaction", "1.0", "Test database from Qt autotests", 1000000);
-    var r="transaction_not_finished";
-
-    try {
-        db.transaction();
-    } catch (err) {
-        if (err.message == "transaction: missing callback")
-            r = "passed";
-        else
-            r = "WRONG ERROR="+err.message;
-    }
-
-    return r;
-}
diff --git a/tests/auto/declarative/sql/data/error-outsidetransaction.js b/tests/auto/declarative/sql/data/error-outsidetransaction.js
deleted file mode 100644
index a7af3bd..0000000
--- a/tests/auto/declarative/sql/data/error-outsidetransaction.js
+++ /dev/null
@@ -1,17 +0,0 @@
-function test() {
-    var db = openDatabaseSync("QmlTestDB-data/error-notransaction", "1.0", "Test database from Qt autotests", 1000000);
-    var r="transaction_not_finished";
-    var v;
-
-    try {
-        db.transaction(function(tx) { v = tx });
-        v.executeSql("SELECT 'bad'")
-    } catch (err) {
-        if (err.message == "executeSql called outside transaction()")
-            r = "passed";
-        else
-            r = "WRONG ERROR="+err.message;
-    }
-
-    return r;
-}
diff --git a/tests/auto/declarative/sql/data/iteration-forwardonly.js b/tests/auto/declarative/sql/data/iteration-forwardonly.js
deleted file mode 100644
index 45947c0..0000000
--- a/tests/auto/declarative/sql/data/iteration-forwardonly.js
+++ /dev/null
@@ -1,29 +0,0 @@
-function test() {
-    var db = openDatabaseSync("QmlTestDB-iteration-forwardonly", "", "Test database from Qt autotests", 1000000);
-    var r="transaction_not_finished";
-
-    db.transaction(
-        function(tx) {
-            tx.executeSql('CREATE TABLE Greeting(salutation TEXT, salutee TEXT)');
-            tx.executeSql('INSERT INTO Greeting VALUES ("Hello", "world")');
-            tx.executeSql('INSERT INTO Greeting VALUES ("Goodbye", "cruel world")');
-        }
-    )
-
-    db.transaction(
-        function(tx) {
-            var rs = tx.executeSql('SELECT * FROM Greeting');
-            rs.forwardOnly = !rs.forwardOnly
-            var r1=""
-            for(var i = 0; i < rs.rows.length; i++)
-                r1 += rs.rows.item(i).salutation + ", " + rs.rows.item(i).salutee + ";"
-            if (r1 != "hello, world;hello, world;hello, world;hello, world;")
-            if (r1 != "Hello, world;Goodbye, cruel world;")
-                r = "SELECTED DATA WRONG: "+r1;
-            else
-                r = "passed";
-        }
-    );
-
-    return r;
-}
diff --git a/tests/auto/declarative/sql/data/iteration.js b/tests/auto/declarative/sql/data/iteration.js
deleted file mode 100644
index c34cbbb..0000000
--- a/tests/auto/declarative/sql/data/iteration.js
+++ /dev/null
@@ -1,28 +0,0 @@
-function test() {
-    var db = openDatabaseSync("QmlTestDB-iteration", "", "Test database from Qt autotests", 1000000);
-    var r="transaction_not_finished";
-
-    db.transaction(
-        function(tx) {
-            tx.executeSql('CREATE TABLE Greeting(salutation TEXT, salutee TEXT)');
-            tx.executeSql('INSERT INTO Greeting VALUES ("Hello", "world")');
-            tx.executeSql('INSERT INTO Greeting VALUES ("Goodbye", "cruel world")');
-        }
-    )
-
-    db.transaction(
-        function(tx) {
-            var rs = tx.executeSql('SELECT * FROM Greeting');
-            var r1=""
-            for(var i = 0; i < rs.rows.length; i++)
-                r1 += rs.rows.item(i).salutation + ", " + rs.rows.item(i).salutee + ";"
-            if (r1 != "hello, world;hello, world;hello, world;hello, world;")
-            if (r1 != "Hello, world;Goodbye, cruel world;")
-                r = "SELECTED DATA WRONG: "+r1;
-            else
-                r = "passed";
-        }
-    );
-
-    return r;
-}
diff --git a/tests/auto/declarative/sql/data/readonly-error.js b/tests/auto/declarative/sql/data/readonly-error.js
deleted file mode 100644
index 69ec67f..0000000
--- a/tests/auto/declarative/sql/data/readonly-error.js
+++ /dev/null
@@ -1,27 +0,0 @@
-function test() {
-    var r="transaction_not_finished";
-    var db = openDatabaseSync("QmlTestDB-readonly-error", "1.0", "Test database from Qt autotests", 1000000);
-
-    db.transaction(
-        function(tx) {
-            tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)');
-            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
-        }
-    );
-
-    try {
-        db.readTransaction(
-            function(tx) {
-                tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
-                r = "FAILED";
-            }
-        );
-    } catch (err) {
-        if (err.message == "Read-only Transaction")
-            r = "passed";
-        else
-            r = "WRONG ERROR="+err.message;
-    }
-
-    return r;
-}
diff --git a/tests/auto/declarative/sql/data/readonly.js b/tests/auto/declarative/sql/data/readonly.js
deleted file mode 100644
index 5ee862c..0000000
--- a/tests/auto/declarative/sql/data/readonly.js
+++ /dev/null
@@ -1,24 +0,0 @@
-function test() {
-    var r="transaction_not_finished";
-    var db = openDatabaseSync("QmlTestDB-readonly", "1.0", "Test database from Qt autotests", 1000000);
-
-    db.transaction(
-        function(tx) {
-            tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)');
-            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
-            r = "passed";
-        }
-    );
-
-    db.readTransaction(
-        function(tx) {
-            var rs = tx.executeSql('SELECT * FROM Greeting');
-            if (rs.rows.item(0).salutation == 'hello')
-                r = "passed";
-            else
-                r = "FAILED";
-        }
-    );
-
-    return r;
-}
diff --git a/tests/auto/declarative/sql/data/reopen1.js b/tests/auto/declarative/sql/data/reopen1.js
deleted file mode 100644
index c1a8157..0000000
--- a/tests/auto/declarative/sql/data/reopen1.js
+++ /dev/null
@@ -1,14 +0,0 @@
-function test() {
-    var r="transaction_not_finished";
-    var db = openDatabaseSync("QmlTestDB-reopen", "1.0", "Test database from Qt autotests", 1000000);
-
-    db.transaction(
-        function(tx) {
-            tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)');
-            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
-            r = "passed";
-        }
-    );
-
-    return r;
-}
diff --git a/tests/auto/declarative/sql/data/reopen2.js b/tests/auto/declarative/sql/data/reopen2.js
deleted file mode 100644
index 4f7248f..0000000
--- a/tests/auto/declarative/sql/data/reopen2.js
+++ /dev/null
@@ -1,16 +0,0 @@
-function test() {
-    var r="transaction_not_finished";
-    var db = openDatabaseSync("QmlTestDB-reopen", "1.0", "Test database from Qt autotests", 1000000);
-
-    db.transaction(
-        function(tx) {
-            var rs = tx.executeSql('SELECT * FROM Greeting');
-            if (rs.rows.item(0).salutation == 'hello')
-                r = "passed";
-            else
-                r = "FAILED";
-        }
-    );
-
-    return r;
-}
diff --git a/tests/auto/declarative/sql/data/selection-bindnames.js b/tests/auto/declarative/sql/data/selection-bindnames.js
deleted file mode 100644
index 9786821..0000000
--- a/tests/auto/declarative/sql/data/selection-bindnames.js
+++ /dev/null
@@ -1,26 +0,0 @@
-function test() {
-    var db = openDatabaseSync("QmlTestDB-bindnames", "", "Test database from Qt autotests", 1000000);
-    var r="transaction_not_finished";
-
-    db.transaction(
-        function(tx) {
-            tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)');
-            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
-            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'goodbye', 'world' ]);
-            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
-            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'there' ]);
-        }
-    );
-
-    db.transaction(
-        function(tx) {
-            var rs = tx.executeSql('SELECT * FROM Greeting WHERE salutation=:p2 AND salutee=:p1', {':p1':'world', ':p2':'hello'});
-            if ( rs.rows.length != 2 )
-                r = "SELECT RETURNED WRONG VALUE "+rs.rows.length+rs.rows.item(0)+rs.rows.item(1)
-            else
-                r = "passed";
-        }
-    );
-
-    return r;
-}
diff --git a/tests/auto/declarative/sql/data/selection.js b/tests/auto/declarative/sql/data/selection.js
deleted file mode 100644
index f116eff..0000000
--- a/tests/auto/declarative/sql/data/selection.js
+++ /dev/null
@@ -1,26 +0,0 @@
-function test() {
-    var db = openDatabaseSync("QmlTestDB-selection", "", "Test database from Qt autotests", 1000000);
-    var r="transaction_not_finished";
-
-    db.transaction(
-        function(tx) {
-            tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)');
-            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
-            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
-        }
-    );
-
-    db.transaction(
-        function(tx) {
-            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
-            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
-            var rs = tx.executeSql('SELECT * FROM Greeting');
-            if ( rs.rows.length != 4 )
-                r = "SELECT RETURNED WRONG VALUE "+rs.rows.length+rs.rows[0]+rs.rows[1]
-            else
-                r = "passed";
-        }
-    );
-
-    return r;
-}
diff --git a/tests/auto/declarative/sql/sql.pro b/tests/auto/declarative/sql/sql.pro
deleted file mode 100644
index 7e4fdd8..0000000
--- a/tests/auto/declarative/sql/sql.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-QT += sql script
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_sql.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-
-CONFIG += parallel_test
-
diff --git a/tests/auto/declarative/sql/tst_sql.cpp b/tests/auto/declarative/sql/tst_sql.cpp
deleted file mode 100644
index c8b8dc3..0000000
--- a/tests/auto/declarative/sql/tst_sql.cpp
+++ /dev/null
@@ -1,239 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include "../../../shared/util.h"
-#include <QtDeclarative/qdeclarativeengine.h>
-#include <QtDeclarative/qdeclarativecomponent.h>
-#include <private/qdeclarativetext_p.h>
-#include <private/qdeclarativeengine_p.h>
-#include <QtCore/qcryptographichash.h>
-#include <QtWebKit/qwebpage.h>
-#include <QtWebKit/qwebframe.h>
-#include <QtWebKit/qwebdatabase.h>
-#include <QtWebKit/qwebsecurityorigin.h>
-#include <QtSql/qsqldatabase.h>
-#include <QtCore/qdir.h>
-#include <QtCore/qfile.h>
-
-class tst_sql : public QObject
-{
-    Q_OBJECT
-public:
-    tst_sql()
-    {
-        qApp->setApplicationName("tst_sql");
-        qApp->setOrganizationName("Nokia");
-        qApp->setOrganizationDomain("nokia.com");
-        engine = new QDeclarativeEngine;
-    }
-
-    ~tst_sql()
-    {
-        delete engine;
-    }
-
-private slots:
-    void initTestCase();
-
-    void checkDatabasePath();
-
-    void testQml_data();
-    void testQml();
-    void testQml_cleanopen_data();
-    void testQml_cleanopen();
-    void totalDatabases();
-
-    void cleanupTestCase();
-
-private:
-    QString dbDir() const;
-    QDeclarativeEngine *engine;
-};
-
-class QWebPageWithJavaScriptConsoleMessages : public QWebPage {
-public:
-    void javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID)
-    {
-        qWarning() << sourceID << ":" << lineNumber << ":" << message;
-    }
-};
-
-void removeRecursive(const QString& dirname)
-{
-    QDir dir(dirname);
-    QFileInfoList entries(dir.entryInfoList(QDir::Dirs|QDir::Files|QDir::NoDotAndDotDot));
-    for (int i = 0; i < entries.count(); ++i)
-        if (entries[i].isDir())
-            removeRecursive(entries[i].filePath());
-        else
-            dir.remove(entries[i].fileName());
-    QDir().rmdir(dirname);
-}
-
-void tst_sql::initTestCase()
-{
-    removeRecursive(dbDir());
-    QDir().mkpath(dbDir());
-}
-
-void tst_sql::cleanupTestCase()
-{
-    removeRecursive(dbDir());
-}
-
-QString tst_sql::dbDir() const
-{
-    static QString tmpd = QDir::tempPath()+"/tst_sql_output-"
-        + QDateTime::currentDateTime().toString(QLatin1String("yyyyMMddhhmmss"));
-    return tmpd;
-}
-
-void tst_sql::checkDatabasePath()
-{
-    // Check default storage path (we can't use it since we don't want to mess with user's data)
-    QVERIFY(engine->offlineStoragePath().contains("tst_sql"));
-    QVERIFY(engine->offlineStoragePath().contains("OfflineStorage"));
-}
-
-static const int total_databases_created_by_tests = 12;
-void tst_sql::testQml_data()
-{
-    QTest::addColumn<QString>("jsfile"); // The input file
-
-    // Each test should use a newly named DB to avoid inter-test dependencies
-    QTest::newRow("creation") << "data/creation.js";
-    QTest::newRow("creation-a") << "data/creation-a.js";
-    QTest::newRow("creation") << "data/creation.js";
-    QTest::newRow("error-creation") << "data/error-creation.js"; // re-uses above DB
-    QTest::newRow("changeversion") << "data/changeversion.js";
-    QTest::newRow("readonly") << "data/readonly.js";
-    QTest::newRow("readonly-error") << "data/readonly-error.js";
-    QTest::newRow("selection") << "data/selection.js";
-    QTest::newRow("selection-bindnames") << "data/selection-bindnames.js";
-    QTest::newRow("iteration") << "data/iteration.js";
-    QTest::newRow("iteration-forwardonly") << "data/iteration-forwardonly.js";
-    QTest::newRow("error-a") << "data/error-a.js";
-    QTest::newRow("error-notransaction") << "data/error-notransaction.js";
-    QTest::newRow("error-outsidetransaction") << "data/error-outsidetransaction.js"; // reuse above
-    QTest::newRow("reopen1") << "data/reopen1.js";
-    QTest::newRow("reopen2") << "data/reopen2.js"; // re-uses above DB
-
-    // If you add a test, you should usually use a new database in the
-    // test - in which case increment total_databases_created_by_tests above.
-}
-
-/*
-void tst_sql::validateAgainstWebkit()
-{
-    // Validates tests against WebKit (HTML5) support.
-    //
-    QFETCH(QString, jsfile);
-    QFETCH(QString, result);
-    QFETCH(int, databases);
-
-    QFile f(jsfile);
-    QVERIFY(f.open(QIODevice::ReadOnly));
-    QString js=f.readAll();
-
-    QWebPageWithJavaScriptConsoleMessages webpage;
-    webpage.settings()->setOfflineStoragePath(dbDir());
-    webpage.settings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, true);
-
-    QEXPECT_FAIL("","WebKit doesn't support openDatabaseSync yet", Continue);
-    QCOMPARE(webpage.mainFrame()->evaluateJavaScript(js).toString(),result);
-
-    QTest::qWait(100); // WebKit crashes if you quit it too fast
-
-    QWebSecurityOrigin origin = webpage.mainFrame()->securityOrigin();
-    QList<QWebDatabase> dbs = origin.databases();
-    QCOMPARE(dbs.count(), databases);
-}
-*/
-
-void tst_sql::testQml()
-{
-    // Tests QML SQL Database support with tests
-    // that have been validated against Webkit.
-    //
-    QFETCH(QString, jsfile);
-
-    QString qml=
-        "import Qt 4.7\n"
-        "import \""+jsfile+"\" as JS\n"
-        "Text { text: JS.test() }";
-
-    engine->setOfflineStoragePath(dbDir());
-    QDeclarativeComponent component(engine);
-    component.setData(qml.toUtf8(), QUrl::fromLocalFile(SRCDIR "/empty.qml")); // just a file for relative local imports
-    QVERIFY(!component.isError());
-    QDeclarativeText *text = qobject_cast<QDeclarativeText*>(component.create());
-    QVERIFY(text != 0);
-    QCOMPARE(text->text(),QString("passed"));
-}
-
-void tst_sql::testQml_cleanopen_data()
-{
-    QTest::addColumn<QString>("jsfile"); // The input file
-    QTest::newRow("reopen1") << "data/reopen1.js";
-    QTest::newRow("reopen2") << "data/reopen2.js";
-    QTest::newRow("error-creation") << "data/error-creation.js"; // re-uses creation DB
-}
-
-void tst_sql::testQml_cleanopen()
-{
-    // Same as testQml, but clean connections between tests,
-    // making it more like the tests are running in new processes.
-    testQml();
-
-    QDeclarativeEnginePrivate::getScriptEngine(engine)->collectGarbage(); // close databases
-    foreach (QString dbname, QSqlDatabase::connectionNames()) {
-        QSqlDatabase::removeDatabase(dbname);
-    }
-}
-
-void tst_sql::totalDatabases()
-{
-    QCOMPARE(QDir(dbDir()+"/Databases").entryInfoList(QDir::Files|QDir::NoDotAndDotDot).count(), total_databases_created_by_tests*2);
-}
-
-QTEST_MAIN(tst_sql)
-
-#include "tst_sql.moc"
-- 
cgit v0.12


From aad82abd84022f5401c6b79ab15d24abebf082af Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Thu, 15 Apr 2010 14:47:10 +1000
Subject: Correctly resolve, and load, IMG tags in Text element.

Task-number: QTBUG-9900

Reviewed-by: Martin Jones
---
 src/declarative/graphicsitems/qdeclarativetext.cpp | 102 +++++++++++++++++++--
 src/declarative/graphicsitems/qdeclarativetext_p.h |   7 ++
 .../graphicsitems/qdeclarativetext_p_p.h           |   5 +-
 .../qdeclarativetext/data/embeddedImagesLocal.qml  |   5 +
 .../data/embeddedImagesLocalError.qml              |   5 +
 .../qdeclarativetext/data/embeddedImagesRemote.qml |   5 +
 .../data/embeddedImagesRemoteError.qml             |   5 +
 .../qdeclarativetext/data/http/exists.png          | Bin 0 -> 2738 bytes
 .../qdeclarativetext/qdeclarativetext.pro          |   7 ++
 .../qdeclarativetext/tst_qdeclarativetext.cpp      |  45 +++++++++
 10 files changed, 176 insertions(+), 10 deletions(-)
 create mode 100644 tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocal.qml
 create mode 100644 tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocalError.qml
 create mode 100644 tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemote.qml
 create mode 100644 tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemoteError.qml
 create mode 100644 tests/auto/declarative/qdeclarativetext/data/http/exists.png

diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index 3a35dd5..3b39fa4 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -43,6 +43,7 @@
 #include "private/qdeclarativetext_p_p.h"
 #include <qdeclarativestyledtext_p.h>
 #include <qdeclarativeinfo.h>
+#include <qdeclarativepixmapcache_p.h>
 
 #include <QTextLayout>
 #include <QTextLine>
@@ -55,6 +56,50 @@
 
 QT_BEGIN_NAMESPACE
 
+class QTextDocumentWithImageResources : public QTextDocument {
+    Q_OBJECT
+
+public:
+    QTextDocumentWithImageResources(QDeclarativeText *parent) :
+        QTextDocument(parent),
+        outstanding(0)
+    {
+    }
+
+    int resourcesLoading() const { return outstanding; }
+
+protected:
+    QVariant loadResource(int type, const QUrl &name)
+    {
+        QUrl url = qmlContext(parent())->resolvedUrl(name);
+
+        if (type == QTextDocument::ImageResource) {
+            QPixmap pm;
+            QDeclarativePixmapReply::Status status = QDeclarativePixmapCache::get(url, &pm, 0, true, 0, 0);
+            if (status == QDeclarativePixmapReply::Ready)
+                return pm;
+            if (status != QDeclarativePixmapReply::Error) {
+                QDeclarativePixmapReply *reply = QDeclarativePixmapCache::request(qmlEngine(parent()), url);
+                connect(reply, SIGNAL(finished()), this, SLOT(requestFinished()));
+                outstanding++;
+                static_cast<QDeclarativeText*>(parent())->reloadWithResources();
+            }
+        }
+
+        return QTextDocument::loadResource(type,url); // The *resolved* URL
+    }
+
+private slots:
+    void requestFinished()
+    {
+        outstanding--;
+        static_cast<QDeclarativeText*>(parent())->reloadWithResources();
+    }
+
+private:
+    int outstanding;
+};
+
 /*!
     \qmlclass Text QDeclarativeText
   \since 4.7
@@ -77,6 +122,9 @@ QT_BEGIN_NAMESPACE
     The \c elide property can alternatively be used to fit a single line of
     plain text to a set width.
 
+    Note that the \l{Supported HTML Subset} is limited, and that if IMG tags
+    load remote images, the text reloads (see resourcesLoading).
+
     Text provides read-only text. For editable text, see \l TextEdit.
 */
 
@@ -259,11 +307,10 @@ void QDeclarativeText::setText(const QString &n)
 
     d->richText = d->format == RichText || (d->format == AutoText && Qt::mightBeRichText(n));
     if (d->richText) {
-        if (!d->doc) {
-            d->doc = new QTextDocument(this);
-            d->doc->setDocumentMargin(0);
+        if (isComponentComplete()) {
+            d->ensureDoc();
+            d->doc->setHtml(n);
         }
-        d->doc->setHtml(n);
     }
 
     d->text = n;
@@ -550,11 +597,10 @@ void QDeclarativeText::setTextFormat(TextFormat format)
         d->updateLayout();
         d->markImgDirty();
     } else if (!wasRich && d->richText) {
-        if (!d->doc) {
-            d->doc = new QTextDocument(this);
-            d->doc->setDocumentMargin(0);
+        if (isComponentComplete()) {
+            d->ensureDoc();
+            d->doc->setHtml(d->text);
         }
-        d->doc->setHtml(d->text);
         d->updateLayout();
         d->markImgDirty();
     }
@@ -898,6 +944,39 @@ void QDeclarativeTextPrivate::checkImgCache()
     imgDirty = false;
 }
 
+void QDeclarativeTextPrivate::ensureDoc()
+{
+    if (!doc) {
+        Q_Q(QDeclarativeText);
+        doc = new QTextDocumentWithImageResources(q);
+        doc->setDocumentMargin(0);
+    }
+}
+
+void QDeclarativeText::reloadWithResources()
+{
+    Q_D(QDeclarativeText);
+    if (!d->richText)
+        return;
+    if (resourcesLoading()!=0)
+        return;
+    emit resourcesLoadingChanged();
+    d->doc->setHtml(d->text);
+    d->updateLayout();
+    d->markImgDirty();
+}
+
+/*!
+    \qmlproperty int Text::resourcesLoading
+    This property is the number of resources (images) that are being loaded asynchronously.
+*/
+int QDeclarativeText::resourcesLoading() const
+{
+    Q_D(const QDeclarativeText);
+    return d->doc ? d->doc->resourcesLoading() : 0;
+}
+
+
 void QDeclarativeText::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
 {
     Q_D(QDeclarativeText);
@@ -1011,6 +1090,10 @@ void QDeclarativeText::componentComplete()
     Q_D(QDeclarativeText);
     QDeclarativeItem::componentComplete();
     if (d->dirty) {
+        if (d->richText) {
+            d->ensureDoc();
+            d->doc->setHtml(d->text);
+        }
         d->updateLayout();
         d->dirty = false;
     }
@@ -1061,4 +1144,7 @@ void QDeclarativeText::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
     if (!event->isAccepted())
         QDeclarativeItem::mouseReleaseEvent(event);
 }
+
 QT_END_NAMESPACE
+
+#include "qdeclarativetext.moc"
diff --git a/src/declarative/graphicsitems/qdeclarativetext_p.h b/src/declarative/graphicsitems/qdeclarativetext_p.h
index 871c833..fcad898 100644
--- a/src/declarative/graphicsitems/qdeclarativetext_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetext_p.h
@@ -72,6 +72,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeText : public QDeclarativeItem
     Q_PROPERTY(bool wrap READ wrap WRITE setWrap NOTIFY wrapModeChanged)
     Q_PROPERTY(TextFormat textFormat READ textFormat WRITE setTextFormat NOTIFY textFormatChanged)
     Q_PROPERTY(TextElideMode elide READ elideMode WRITE setElideMode NOTIFY elideModeChanged) //### elideMode?
+    Q_PROPERTY(int resourcesLoading READ resourcesLoading NOTIFY resourcesLoadingChanged)
 
 public:
     QDeclarativeText(QDeclarativeItem *parent=0);
@@ -138,6 +139,8 @@ public:
 
     virtual void componentComplete();
 
+    int resourcesLoading() const;
+
 Q_SIGNALS:
     void textChanged(const QString &text);
     void linkActivated(const QString &link);
@@ -150,6 +153,7 @@ Q_SIGNALS:
     void wrapModeChanged();
     void textFormatChanged(TextFormat textFormat);
     void elideModeChanged(TextElideMode mode);
+    void resourcesLoadingChanged();
 
 protected:
     void mousePressEvent(QGraphicsSceneMouseEvent *event);
@@ -160,6 +164,9 @@ protected:
 private:
     Q_DISABLE_COPY(QDeclarativeText)
     Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeText)
+
+    friend class QTextDocumentWithImageResources;
+    void reloadWithResources();
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativetext_p_p.h b/src/declarative/graphicsitems/qdeclarativetext_p_p.h
index cc5a9f2..332f99e 100644
--- a/src/declarative/graphicsitems/qdeclarativetext_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetext_p_p.h
@@ -63,7 +63,7 @@
 QT_BEGIN_NAMESPACE
 
 class QTextLayout;
-class QTextDocument;
+class QTextDocumentWithImageResources;
 
 class QDeclarativeTextPrivate : public QDeclarativeItemPrivate
 {
@@ -84,6 +84,7 @@ public:
 
     ~QDeclarativeTextPrivate();
 
+    void ensureDoc();
     void updateSize();
     void updateLayout();
     void markImgDirty() {
@@ -118,7 +119,7 @@ public:
     bool richText:1;
     bool singleline:1;
     bool cache:1;
-    QTextDocument *doc;
+    QTextDocumentWithImageResources *doc;
     QTextLayout layout;
     QSize cachedLayoutSize;
     QDeclarativeText::TextFormat format;
diff --git a/tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocal.qml b/tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocal.qml
new file mode 100644
index 0000000..5aeea56
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocal.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+Text {
+    text: "<img src='http/exists.png'>"
+}
diff --git a/tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocalError.qml b/tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocalError.qml
new file mode 100644
index 0000000..17bb21c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocalError.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+Text {
+    text: "<img src='http/notexists.png'>"
+}
diff --git a/tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemote.qml b/tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemote.qml
new file mode 100644
index 0000000..53b0266
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemote.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+Text {
+    text: "<img src='http://127.0.0.1:14453/exists.png'>"
+}
diff --git a/tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemoteError.qml b/tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemoteError.qml
new file mode 100644
index 0000000..48c7a95
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemoteError.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+Text {
+    text: "<img src='http://127.0.0.1:14453/notexists.png'>"
+}
diff --git a/tests/auto/declarative/qdeclarativetext/data/http/exists.png b/tests/auto/declarative/qdeclarativetext/data/http/exists.png
new file mode 100644
index 0000000..399bd0b
Binary files /dev/null and b/tests/auto/declarative/qdeclarativetext/data/http/exists.png differ
diff --git a/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro b/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro
index 73c05b5..e70443e 100644
--- a/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro
+++ b/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro
@@ -1,8 +1,15 @@
 load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative gui
+QT += network
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativetext.cpp
 
+INCLUDEPATH += ../shared/
+HEADERS += ../shared/testhttpserver.h
+SOURCES += ../shared/testhttpserver.cpp
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
index 6637415..53640d0 100644
--- a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
+++ b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
@@ -48,6 +48,9 @@
 #include <QGraphicsSceneMouseEvent>
 #include <qmath.h>
 
+#include "../../../shared/util.h"
+#include "testhttpserver.h"
+
 class tst_qdeclarativetext : public QObject
 
 {
@@ -62,6 +65,9 @@ private slots:
     void elide();
     void textFormat();
 
+    void embeddedImages_data();
+    void embeddedImages();
+
     // ### these tests may be trivial    
     void horizontalAlignment();
     void verticalAlignment();
@@ -859,6 +865,45 @@ void tst_qdeclarativetext::clickLink()
     }
 }
 
+void tst_qdeclarativetext::embeddedImages_data()
+{
+    QTest::addColumn<QUrl>("qmlfile");
+    QTest::addColumn<QString>("error");
+    QTest::newRow("local") << QUrl::fromLocalFile(SRCDIR "/data/embeddedImagesLocal.qml") << "";
+    QTest::newRow("local-error") << QUrl::fromLocalFile(SRCDIR "/data/embeddedImagesLocalError.qml")
+        << "\"Cannot open: " + QUrl::fromLocalFile(SRCDIR "/data/http/notexists.png").toString() + "\" ";
+    QTest::newRow("remote") << QUrl::fromLocalFile(SRCDIR "/data/embeddedImagesRemote.qml") << "";
+    QTest::newRow("remote-error") << QUrl::fromLocalFile(SRCDIR "/data/embeddedImagesRemoteError.qml")
+        << "\"Error downloading http://127.0.0.1:14453/notexists.png - server replied: Not found\" ";
+}
+
+void tst_qdeclarativetext::embeddedImages()
+{
+    // Tests QTBUG-9900
+
+    QFETCH(QUrl, qmlfile);
+    QFETCH(QString, error);
+
+    TestHTTPServer server(14453);
+    server.serveDirectory(SRCDIR "/data/http");
+
+    if (!error.isEmpty())
+        QTest::ignoreMessage(QtWarningMsg, error.toLatin1());
+    
+    QDeclarativeComponent textComponent(&engine, qmlfile);
+    QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+    QVERIFY(textObject != 0);
+
+    QTRY_COMPARE(textObject->resourcesLoading(), 0);
+
+    if (error.isEmpty()) {
+        QPixmap pm(SRCDIR "/data/http/exists.png");
+        QCOMPARE(textObject->width(), double(pm.width()));
+        QCOMPARE(textObject->height(), double(pm.height()));
+    }
+}
+
 QTEST_MAIN(tst_qdeclarativetext)
 
 #include "tst_qdeclarativetext.moc"
-- 
cgit v0.12


From efde86d38896c13dc8d447e33e80baec5b6cdc1d Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Thu, 15 Apr 2010 14:57:06 +1000
Subject: Doc improvements

---
 doc/src/declarative/advtutorial.qdoc    |  33 +++++++++++++++++++-------------
 doc/src/images/declarative-samegame.png | Bin 0 -> 124904 bytes
 2 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 doc/src/images/declarative-samegame.png

diff --git a/doc/src/declarative/advtutorial.qdoc b/doc/src/declarative/advtutorial.qdoc
index 3a70eee..751bf00 100644
--- a/doc/src/declarative/advtutorial.qdoc
+++ b/doc/src/declarative/advtutorial.qdoc
@@ -46,27 +46,34 @@
 \nextpage QML Advanced Tutorial 1 - Creating the Game Canvas and Blocks
 
 This tutorial walks step-by-step through the creation of a full application using QML.
+It assumes that you already know the basics of QML (for example, from reading the
+\l{QML Tutorial}{simple tutorial}). 
 
-It is assumed that you already know the basics of QML (for example, from reading the \l{QML Tutorial}{simple tutorial}) and this
-tutorial focuses on using that knowledge to produce a complete and functioning application.
+In this tutorial we write a game, \e {Same Game}, based on the Same Game application
+included in the declarative \c demos directory, which looks like this:
 
-The tutorial involves a significant amount of JavaScript to implement the game logic. An understanding of JavaScript is helpful to understand parts of this tutorial, but if you don't understand JavaScript you can still get a feel for how you can integrate backend logic to create and control QML elements. From the QML perspective, there is little difference between integrating QML with backend logic written in C++ and backend logic written in JavaScript.
+\image declarative-samegame.png
 
-In this tutorial we recreate, step by step, a version of the Same Game demo in $QTDIR/demos/declarative/samegame.qml.
-The results of the individual steps are in the $QTDIR/examples/declarative/tutorials/samegame directory.
+We will cover concepts for producing a fully functioning application, including
+JavaScript integration, using QML  \l States and \l {Behavior}{Behaviors} to 
+manage components and enhance your interface, and storing persistent application data.
+
+An understanding of JavaScript is helpful to understand parts of this tutorial, but if you don't
+know JavaScript you can still get a feel for how you can integrate backend logic to create and
+control QML elements.
 
-The Same Game demo has been extended since this tutorial was written. This tutorial only covers the version in 
-the $QTDIR/examples/declarative/tutorials/samegame directory. However once you have completed the tutorial you should be able
-to understand the extensions in the most recent Same Game demo, and even extend it yourself.
 
 Tutorial chapters:
 
-\list
-\o \l {QML Advanced Tutorial 1 - Creating the Game Canvas and Blocks}
-\o \l {QML Advanced Tutorial 2 - Populating the Game Canvas}
-\o \l {QML Advanced Tutorial 3 - Implementing the Game Logic}
-\o \l {QML Advanced Tutorial 4 - Finishing Touches}
+\list 1
+\o \l {QML Advanced Tutorial 1 - Creating the Game Canvas and Blocks}{Creating the Game Canvas and Blocks}
+\o \l {QML Advanced Tutorial 2 - Populating the Game Canvas}{Populating the Game Canvas}}
+\o \l {QML Advanced Tutorial 3 - Implementing the Game Logic}{Implementing the Game Logic}
+\o \l {QML Advanced Tutorial 4 - Finishing Touches}{Finishing Touches}
 \endlist
+
+All the code in this tutorial can be found in the $QTDIR/examples/declarative/tutorials/samegame
+directory.
 */
 
 /*!
diff --git a/doc/src/images/declarative-samegame.png b/doc/src/images/declarative-samegame.png
new file mode 100644
index 0000000..2232df2
Binary files /dev/null and b/doc/src/images/declarative-samegame.png differ
-- 
cgit v0.12


From 6dba05f9334a82c849806293ff0448c65c33a5d2 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Thu, 15 Apr 2010 15:00:09 +1000
Subject: Rename section so that it's not linked to by references to
 "JavaScript"

---
 doc/src/declarative/codingconventions.qdoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/src/declarative/codingconventions.qdoc b/doc/src/declarative/codingconventions.qdoc
index e1e7871..7ae5cbd 100644
--- a/doc/src/declarative/codingconventions.qdoc
+++ b/doc/src/declarative/codingconventions.qdoc
@@ -101,7 +101,7 @@ we will write this:
 \snippet doc/src/snippets/declarative/codingconventions/lists.qml 1
 
 
-\section1 Javascript
+\section1 Javascript code
 
 If the script is a single expression, we recommend writing it inline:
 
-- 
cgit v0.12


From 62e52a19f1c7ac81a36f394e43f916c3c8933e8f Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Thu, 15 Apr 2010 15:10:44 +1000
Subject: Visual test updates.

---
 .../qmlvisual/Package_Views/packageviews.qml       |    5 +-
 .../data/colorAnimation-visual.0.png               |  Bin 0 -> 627 bytes
 .../data/colorAnimation-visual.1.png               |  Bin 0 -> 626 bytes
 .../data/colorAnimation-visual.2.png               |  Bin 0 -> 625 bytes
 .../colorAnimation/data/colorAnimation-visual.qml  |   14 +-
 .../colorAnimation/data/colorAnimation.0.png       |  Bin 627 -> 0 bytes
 .../colorAnimation/data/colorAnimation.1.png       |  Bin 626 -> 0 bytes
 .../colorAnimation/data/colorAnimation.2.png       |  Bin 625 -> 0 bytes
 .../data/propertyAction-visual.0.png               |  Bin 0 -> 1418 bytes
 .../data/propertyAction-visual.1.png               |  Bin 0 -> 1430 bytes
 .../data/propertyAction-visual.2.png               |  Bin 0 -> 1431 bytes
 .../propertyAction/data/propertyAction-visual.qml  |    8 +-
 .../propertyAction/data/propertyAction.0.png       |  Bin 1418 -> 0 bytes
 .../propertyAction/data/propertyAction.1.png       |  Bin 1430 -> 0 bytes
 .../propertyAction/data/propertyAction.2.png       |  Bin 1431 -> 0 bytes
 .../data/animated-smooth.1.png                     |  Bin 98912 -> 98927 bytes
 .../data/animated-smooth.qml                       |  110 +-
 .../qdeclarativeborderimage/data/borders.1.png     |  Bin 23029 -> 0 bytes
 .../qdeclarativeborderimage/data/borders.2.png     |  Bin 23029 -> 0 bytes
 .../qdeclarativeborderimage/data/borders.3.png     |  Bin 23029 -> 0 bytes
 .../qdeclarativeborderimage/data/borders.4.png     |  Bin 23029 -> 0 bytes
 .../qdeclarativeborderimage/data/borders.qml       | 1350 +-------------------
 .../qmlvisual/qdeclarativeparticles/particles.qml  |    1 +
 .../qdeclarativepositioners/data/repeater.qml      |  339 -----
 .../qdeclarativepositioners/data/usingRepeater.qml |  339 +++++
 .../qmlvisual/qdeclarativepositioners/repeater.qml |   15 -
 .../qdeclarativepositioners/usingRepeater.qml      |   15 +
 tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp |   25 +-
 tools/qml/qdeclarativetester.cpp                   |   18 +
 29 files changed, 463 insertions(+), 1776 deletions(-)
 create mode 100644 tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.1.png
 create mode 100644 tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.2.png
 delete mode 100644 tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.1.png
 delete mode 100644 tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.2.png
 create mode 100644 tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.1.png
 create mode 100644 tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.2.png
 delete mode 100644 tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.1.png
 delete mode 100644 tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.2.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.1.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.2.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.3.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.4.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/repeater.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/qdeclarativepositioners/repeater.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativepositioners/usingRepeater.qml

diff --git a/tests/auto/declarative/qmlvisual/Package_Views/packageviews.qml b/tests/auto/declarative/qmlvisual/Package_Views/packageviews.qml
index f6c033f..7ccba10 100644
--- a/tests/auto/declarative/qmlvisual/Package_Views/packageviews.qml
+++ b/tests/auto/declarative/qmlvisual/Package_Views/packageviews.qml
@@ -63,8 +63,9 @@ Rectangle {
                     Transition {
                         from: "*"; to: "*"
                         SequentialAnimation {
-                            ParentAction{}
-                            NumberAnimation { properties: "x,y,width"; easing.type: "InOutQuad" }
+                            ParentAnimation{
+                                NumberAnimation { properties: "x,y,width"; easing.type: "InOutQuad" }
+                            }
                         }
                     }
                 ]
diff --git a/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.0.png b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.0.png
new file mode 100644
index 0000000..e6ea16d
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.1.png b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.1.png
new file mode 100644
index 0000000..b75ba61
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.2.png b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.2.png
new file mode 100644
index 0000000..4320f6f
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.qml b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.qml
index 4d0959a..4ab94f3 100644
--- a/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.qml
+++ b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.qml
@@ -258,7 +258,7 @@ VisualTest {
     }
     Frame {
         msec: 960
-        image: "colorAnimation.0.png"
+        image: "colorAnimation-visual.0.png"
     }
     Frame {
         msec: 976
@@ -270,7 +270,7 @@ VisualTest {
     }
     Frame {
         msec: 1008
-        hash: "243dbffcf416926242bbcb7348974c4c"
+        hash: "e0f53c5605116a30d9bf3c031c63d958"
     }
     Frame {
         msec: 1024
@@ -370,7 +370,7 @@ VisualTest {
     }
     Frame {
         msec: 1408
-        hash: "7178bfe86fd2fd513218b33760460f8d"
+        hash: "45770fe0d61c485c13992d0f98b2a3ba"
     }
     Frame {
         msec: 1424
@@ -470,7 +470,7 @@ VisualTest {
     }
     Frame {
         msec: 1808
-        hash: "8593a81be812edf54ec94da8ae9c1314"
+        hash: "a2fa71b4147372175774250501b6625e"
     }
     Frame {
         msec: 1824
@@ -498,7 +498,7 @@ VisualTest {
     }
     Frame {
         msec: 1920
-        image: "colorAnimation.1.png"
+        image: "colorAnimation-visual.1.png"
     }
     Frame {
         msec: 1936
@@ -570,7 +570,7 @@ VisualTest {
     }
     Frame {
         msec: 2208
-        hash: "e5dc5450604a491cc24a0dcf5c278b58"
+        hash: "10d46d2862e333e5136b1c046dabb33b"
     }
     Frame {
         msec: 2224
@@ -738,7 +738,7 @@ VisualTest {
     }
     Frame {
         msec: 2880
-        image: "colorAnimation.2.png"
+        image: "colorAnimation-visual.2.png"
     }
     Frame {
         msec: 2896
diff --git a/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.0.png b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.0.png
deleted file mode 100644
index e6ea16d..0000000
Binary files a/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.1.png b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.1.png
deleted file mode 100644
index b75ba61..0000000
Binary files a/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.1.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.2.png b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.2.png
deleted file mode 100644
index 4320f6f..0000000
Binary files a/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.2.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.0.png b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.0.png
new file mode 100644
index 0000000..64d6b06
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.1.png b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.1.png
new file mode 100644
index 0000000..f7fce15
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.2.png b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.2.png
new file mode 100644
index 0000000..3080df5
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.qml b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.qml
index 7c8c233..0a9057e 100644
--- a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.qml
+++ b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.qml
@@ -242,7 +242,7 @@ VisualTest {
     }
     Frame {
         msec: 960
-        image: "propertyAction.0.png"
+        image: "propertyAction-visual.0.png"
     }
     Frame {
         msec: 976
@@ -490,7 +490,7 @@ VisualTest {
     }
     Frame {
         msec: 1920
-        image: "propertyAction.1.png"
+        image: "propertyAction-visual.1.png"
     }
     Frame {
         msec: 1936
@@ -738,7 +738,7 @@ VisualTest {
     }
     Frame {
         msec: 2880
-        image: "propertyAction.2.png"
+        image: "propertyAction-visual.2.png"
     }
     Frame {
         msec: 2896
@@ -810,7 +810,7 @@ VisualTest {
     }
     Frame {
         msec: 3168
-        hash: "dcc79277fdb8966e5a3f2ed1b2fc4292"
+        hash: "38b7e5894cf49a19ac055264d6447b9f"
     }
     Frame {
         msec: 3184
diff --git a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.0.png b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.0.png
deleted file mode 100644
index 64d6b06..0000000
Binary files a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.1.png b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.1.png
deleted file mode 100644
index f7fce15..0000000
Binary files a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.1.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.2.png b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.2.png
deleted file mode 100644
index 3080df5..0000000
Binary files a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.2.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.1.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.1.png
index 1f960e5..4366d53 100644
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.qml b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.qml
index 043f5e2..c6df3c4 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.qml
@@ -130,7 +130,7 @@ VisualTest {
     }
     Frame {
         msec: 512
-        hash: "37c3f25e5cfdb48d7e3ab0cf8ffb9154"
+        hash: "0f347763f25350ebb62dda1536372b45"
     }
     Frame {
         msec: 528
@@ -186,7 +186,7 @@ VisualTest {
     }
     Frame {
         msec: 736
-        hash: "902683d72f789399e9d99d1cea1bf177"
+        hash: "74af3457583fbaf73f14556aeccc8403"
     }
     Frame {
         msec: 752
@@ -210,7 +210,7 @@ VisualTest {
     }
     Frame {
         msec: 832
-        hash: "a15f19f374bbfb6a922b69d080a91eaa"
+        hash: "d2ed2cf3a12e41bac299399cc35abe6a"
     }
     Frame {
         msec: 848
@@ -294,7 +294,7 @@ VisualTest {
     }
     Frame {
         msec: 1168
-        hash: "2192094410e2d7c8d9d4aa5f8deacff5"
+        hash: "85ef33fcb3f91e4fc20391bf94455984"
     }
     Frame {
         msec: 1184
@@ -302,7 +302,7 @@ VisualTest {
     }
     Frame {
         msec: 1200
-        hash: "92176cce4836dcae4dfca94e49b041a8"
+        hash: "07acba64dc608439a8a54fcb080379e8"
     }
     Frame {
         msec: 1216
@@ -310,7 +310,7 @@ VisualTest {
     }
     Frame {
         msec: 1232
-        hash: "42be5d26afb9f066dd27cc9fbaf6ce20"
+        hash: "1f964c6c9bebdc9945dc69a6095400f7"
     }
     Frame {
         msec: 1248
@@ -318,7 +318,7 @@ VisualTest {
     }
     Frame {
         msec: 1264
-        hash: "7f9999a9c87af43b9703323efab31770"
+        hash: "2084ccc60ddd493399c128717816d33b"
     }
     Frame {
         msec: 1280
@@ -346,7 +346,7 @@ VisualTest {
     }
     Frame {
         msec: 1376
-        hash: "49a1df977b0494c7c72ca0b65c394e13"
+        hash: "45d891d804609ebbe1d5ac3f826d0c17"
     }
     Frame {
         msec: 1392
@@ -406,7 +406,7 @@ VisualTest {
     }
     Frame {
         msec: 1616
-        hash: "4520003d4b221a3de6834b2729b3026d"
+        hash: "880640372bf584955627f6835f24be13"
     }
     Frame {
         msec: 1632
@@ -414,7 +414,7 @@ VisualTest {
     }
     Frame {
         msec: 1648
-        hash: "83d49474db15d5779923972ff5f55917"
+        hash: "705d9c8de05c859a42769f73761c6a63"
     }
     Frame {
         msec: 1664
@@ -426,7 +426,7 @@ VisualTest {
     }
     Frame {
         msec: 1696
-        hash: "d8e398a1ce9ca45c19951e93bd5c932a"
+        hash: "64cd225202ed6c91b02c368a9160a656"
     }
     Frame {
         msec: 1712
@@ -438,7 +438,7 @@ VisualTest {
     }
     Frame {
         msec: 1744
-        hash: "fc913807eb1069d611495fbd5d43ee3d"
+        hash: "fe899138116774df4c4441687e3019c5"
     }
     Frame {
         msec: 1760
@@ -450,7 +450,7 @@ VisualTest {
     }
     Frame {
         msec: 1792
-        hash: "e3a2b5c7247acfc1b30825233fbfd56b"
+        hash: "c3ea530de646612f9203c5800cad884b"
     }
     Frame {
         msec: 1808
@@ -490,7 +490,7 @@ VisualTest {
     }
     Frame {
         msec: 1952
-        hash: "3991bc7760b7981d80665e3a7654c9f4"
+        hash: "b980703c1d0018937e83a8ba8862469e"
     }
     Frame {
         msec: 1968
@@ -502,15 +502,15 @@ VisualTest {
     }
     Frame {
         msec: 2000
-        hash: "723f87da7e5b002a2e9b0bcbc81f9458"
+        hash: "ee297a2d68c9e58157d9bf189d353713"
     }
     Frame {
         msec: 2016
-        hash: "6b8ded0d9386a3fff0601a100c513080"
+        hash: "00f3c9b8b37cb104cf2a7701639bc61f"
     }
     Frame {
         msec: 2032
-        hash: "f976cd5046ef5391536859e63db905bd"
+        hash: "ee297a2d68c9e58157d9bf189d353713"
     }
     Frame {
         msec: 2048
@@ -562,7 +562,7 @@ VisualTest {
     }
     Frame {
         msec: 2240
-        hash: "e3a2b5c7247acfc1b30825233fbfd56b"
+        hash: "c3ea530de646612f9203c5800cad884b"
     }
     Frame {
         msec: 2256
@@ -598,7 +598,7 @@ VisualTest {
     }
     Frame {
         msec: 2384
-        hash: "83d49474db15d5779923972ff5f55917"
+        hash: "705d9c8de05c859a42769f73761c6a63"
     }
     Frame {
         msec: 2400
@@ -606,7 +606,7 @@ VisualTest {
     }
     Frame {
         msec: 2416
-        hash: "4520003d4b221a3de6834b2729b3026d"
+        hash: "880640372bf584955627f6835f24be13"
     }
     Frame {
         msec: 2432
@@ -666,7 +666,7 @@ VisualTest {
     }
     Frame {
         msec: 2656
-        hash: "a676f45d946aeb9fa577c0e862735b01"
+        hash: "45d891d804609ebbe1d5ac3f826d0c17"
     }
     Frame {
         msec: 2672
@@ -702,7 +702,7 @@ VisualTest {
     }
     Frame {
         msec: 2800
-        hash: "42be5d26afb9f066dd27cc9fbaf6ce20"
+        hash: "1f964c6c9bebdc9945dc69a6095400f7"
     }
     Frame {
         msec: 2816
@@ -710,7 +710,7 @@ VisualTest {
     }
     Frame {
         msec: 2832
-        hash: "92176cce4836dcae4dfca94e49b041a8"
+        hash: "07acba64dc608439a8a54fcb080379e8"
     }
     Frame {
         msec: 2848
@@ -802,7 +802,7 @@ VisualTest {
     }
     Frame {
         msec: 3200
-        hash: "a15f19f374bbfb6a922b69d080a91eaa"
+        hash: "d2ed2cf3a12e41bac299399cc35abe6a"
     }
     Frame {
         msec: 3216
@@ -826,7 +826,7 @@ VisualTest {
     }
     Frame {
         msec: 3296
-        hash: "902683d72f789399e9d99d1cea1bf177"
+        hash: "74af3457583fbaf73f14556aeccc8403"
     }
     Frame {
         msec: 3312
@@ -854,7 +854,7 @@ VisualTest {
     }
     Frame {
         msec: 3408
-        hash: "f602e3eda1889d1a7e49560f0dfb5d4c"
+        hash: "89c159ef00d273ecfe61332e1bf7244d"
     }
     Frame {
         msec: 3424
@@ -862,7 +862,7 @@ VisualTest {
     }
     Frame {
         msec: 3440
-        hash: "c8312ede0998636a6bd6451d13636577"
+        hash: "61c16009b65a55bffb63e27727e1615e"
     }
     Frame {
         msec: 3456
@@ -950,7 +950,7 @@ VisualTest {
     }
     Frame {
         msec: 3792
-        hash: "8419b295f67cae133760da79dfc26505"
+        hash: "f22a47b846cfee96ebdf39bbce2e6d51"
     }
     Frame {
         msec: 3808
@@ -970,7 +970,7 @@ VisualTest {
     }
     Frame {
         msec: 3872
-        hash: "d56ba74d38c1889a278929d1c1b7f17a"
+        hash: "ed9f2ca797894612600bc4b7fbaecb84"
     }
     Frame {
         msec: 3888
@@ -1130,7 +1130,7 @@ VisualTest {
     }
     Frame {
         msec: 4512
-        hash: "37c3f25e5cfdb48d7e3ab0cf8ffb9154"
+        hash: "0f347763f25350ebb62dda1536372b45"
     }
     Frame {
         msec: 4528
@@ -1186,7 +1186,7 @@ VisualTest {
     }
     Frame {
         msec: 4736
-        hash: "902683d72f789399e9d99d1cea1bf177"
+        hash: "74af3457583fbaf73f14556aeccc8403"
     }
     Frame {
         msec: 4752
@@ -1210,7 +1210,7 @@ VisualTest {
     }
     Frame {
         msec: 4832
-        hash: "a15f19f374bbfb6a922b69d080a91eaa"
+        hash: "d2ed2cf3a12e41bac299399cc35abe6a"
     }
     Frame {
         msec: 4848
@@ -1294,7 +1294,7 @@ VisualTest {
     }
     Frame {
         msec: 5168
-        hash: "2192094410e2d7c8d9d4aa5f8deacff5"
+        hash: "85ef33fcb3f91e4fc20391bf94455984"
     }
     Frame {
         msec: 5184
@@ -1302,7 +1302,7 @@ VisualTest {
     }
     Frame {
         msec: 5200
-        hash: "92176cce4836dcae4dfca94e49b041a8"
+        hash: "07acba64dc608439a8a54fcb080379e8"
     }
     Frame {
         msec: 5216
@@ -1310,7 +1310,7 @@ VisualTest {
     }
     Frame {
         msec: 5232
-        hash: "42be5d26afb9f066dd27cc9fbaf6ce20"
+        hash: "1f964c6c9bebdc9945dc69a6095400f7"
     }
     Frame {
         msec: 5248
@@ -1318,7 +1318,7 @@ VisualTest {
     }
     Frame {
         msec: 5264
-        hash: "7f9999a9c87af43b9703323efab31770"
+        hash: "2084ccc60ddd493399c128717816d33b"
     }
     Frame {
         msec: 5280
@@ -1346,7 +1346,7 @@ VisualTest {
     }
     Frame {
         msec: 5376
-        hash: "49a1df977b0494c7c72ca0b65c394e13"
+        hash: "45d891d804609ebbe1d5ac3f826d0c17"
     }
     Frame {
         msec: 5392
@@ -1406,7 +1406,7 @@ VisualTest {
     }
     Frame {
         msec: 5616
-        hash: "4520003d4b221a3de6834b2729b3026d"
+        hash: "880640372bf584955627f6835f24be13"
     }
     Frame {
         msec: 5632
@@ -1414,7 +1414,7 @@ VisualTest {
     }
     Frame {
         msec: 5648
-        hash: "83d49474db15d5779923972ff5f55917"
+        hash: "705d9c8de05c859a42769f73761c6a63"
     }
     Frame {
         msec: 5664
@@ -1426,7 +1426,7 @@ VisualTest {
     }
     Frame {
         msec: 5696
-        hash: "d8e398a1ce9ca45c19951e93bd5c932a"
+        hash: "64cd225202ed6c91b02c368a9160a656"
     }
     Frame {
         msec: 5712
@@ -1438,7 +1438,7 @@ VisualTest {
     }
     Frame {
         msec: 5744
-        hash: "fc913807eb1069d611495fbd5d43ee3d"
+        hash: "fe899138116774df4c4441687e3019c5"
     }
     Frame {
         msec: 5760
@@ -1450,7 +1450,7 @@ VisualTest {
     }
     Frame {
         msec: 5792
-        hash: "e3a2b5c7247acfc1b30825233fbfd56b"
+        hash: "c3ea530de646612f9203c5800cad884b"
     }
     Frame {
         msec: 5808
@@ -1482,7 +1482,7 @@ VisualTest {
     }
     Frame {
         msec: 5920
-        hash: "ec7e1190dd4fe122545e6ce6c8740500"
+        hash: "3b7b83e97d17440b42e6ef4b962076d8"
     }
     Frame {
         msec: 5936
@@ -1490,7 +1490,7 @@ VisualTest {
     }
     Frame {
         msec: 5952
-        hash: "3991bc7760b7981d80665e3a7654c9f4"
+        hash: "b980703c1d0018937e83a8ba8862469e"
     }
     Frame {
         msec: 5968
@@ -1502,15 +1502,15 @@ VisualTest {
     }
     Frame {
         msec: 6000
-        hash: "723f87da7e5b002a2e9b0bcbc81f9458"
+        hash: "ee297a2d68c9e58157d9bf189d353713"
     }
     Frame {
         msec: 6016
-        hash: "6b8ded0d9386a3fff0601a100c513080"
+        hash: "00f3c9b8b37cb104cf2a7701639bc61f"
     }
     Frame {
         msec: 6032
-        hash: "f976cd5046ef5391536859e63db905bd"
+        hash: "ee297a2d68c9e58157d9bf189d353713"
     }
     Frame {
         msec: 6048
@@ -1562,7 +1562,7 @@ VisualTest {
     }
     Frame {
         msec: 6240
-        hash: "e3a2b5c7247acfc1b30825233fbfd56b"
+        hash: "c3ea530de646612f9203c5800cad884b"
     }
     Frame {
         msec: 6256
@@ -1598,7 +1598,7 @@ VisualTest {
     }
     Frame {
         msec: 6384
-        hash: "83d49474db15d5779923972ff5f55917"
+        hash: "705d9c8de05c859a42769f73761c6a63"
     }
     Frame {
         msec: 6400
@@ -1606,7 +1606,7 @@ VisualTest {
     }
     Frame {
         msec: 6416
-        hash: "4520003d4b221a3de6834b2729b3026d"
+        hash: "880640372bf584955627f6835f24be13"
     }
     Frame {
         msec: 6432
@@ -1666,7 +1666,7 @@ VisualTest {
     }
     Frame {
         msec: 6656
-        hash: "a676f45d946aeb9fa577c0e862735b01"
+        hash: "45d891d804609ebbe1d5ac3f826d0c17"
     }
     Frame {
         msec: 6672
@@ -1702,7 +1702,7 @@ VisualTest {
     }
     Frame {
         msec: 6800
-        hash: "42be5d26afb9f066dd27cc9fbaf6ce20"
+        hash: "1f964c6c9bebdc9945dc69a6095400f7"
     }
     Frame {
         msec: 6816
@@ -1710,7 +1710,7 @@ VisualTest {
     }
     Frame {
         msec: 6832
-        hash: "92176cce4836dcae4dfca94e49b041a8"
+        hash: "07acba64dc608439a8a54fcb080379e8"
     }
     Frame {
         msec: 6848
@@ -1779,7 +1779,7 @@ VisualTest {
     Key {
         type: 6
         key: 16777249
-        modifiers: 67108864
+        modifiers: 0
         text: ""
         autorep: false
         count: 1
@@ -1810,7 +1810,7 @@ VisualTest {
     }
     Frame {
         msec: 7200
-        hash: "a15f19f374bbfb6a922b69d080a91eaa"
+        hash: "d2ed2cf3a12e41bac299399cc35abe6a"
     }
     Frame {
         msec: 7216
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.1.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.1.png
deleted file mode 100644
index 80cbd26..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.1.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.2.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.2.png
deleted file mode 100644
index 80cbd26..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.2.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.3.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.3.png
deleted file mode 100644
index 80cbd26..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.3.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.4.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.4.png
deleted file mode 100644
index 80cbd26..0000000
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.4.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.qml b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.qml
index 16cd5e9..1403d35 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.qml
@@ -6,1354 +6,6 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 32
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 48
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 64
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 80
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 96
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 112
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 128
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 144
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 160
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 176
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 192
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 208
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 224
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 240
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 256
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 272
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 288
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 304
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 320
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 336
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 352
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 368
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 384
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 400
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 416
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 432
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 448
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 464
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 480
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 496
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 512
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 528
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 544
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 560
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 576
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 592
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 608
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 624
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 640
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 656
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 672
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 688
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 704
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 720
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 736
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 752
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 768
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 784
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 800
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 816
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 832
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 848
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 864
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 880
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 896
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 912
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 928
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 944
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 960
-        image: "borders.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 992
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1008
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1024
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1040
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1056
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1072
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1088
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1104
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1120
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1136
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1152
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1168
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1184
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1200
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1216
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1232
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1248
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1264
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1280
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1296
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1312
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1328
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1344
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1360
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1376
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1392
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1408
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1424
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1440
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1456
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1472
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1488
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1504
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1520
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1536
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1552
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1568
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1584
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1600
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1616
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1632
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1648
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1664
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1680
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1696
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1712
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1728
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1744
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1760
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1776
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1792
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1808
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1824
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1840
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1856
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1872
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1888
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1904
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1920
-        image: "borders.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1952
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1968
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1984
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2000
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2016
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2032
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2048
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2064
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2080
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2096
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2112
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2128
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2144
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2160
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2176
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2192
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2208
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2224
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2240
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2256
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2272
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2288
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2304
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2320
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2336
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2352
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2368
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2384
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2400
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2416
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2432
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2448
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2464
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2480
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2496
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2512
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2528
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2544
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2560
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2576
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2592
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2608
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2624
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2640
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2656
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2672
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2688
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2704
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2720
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2736
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2752
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2768
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2784
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2800
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2816
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2832
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2848
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2864
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2880
-        image: "borders.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2912
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2928
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2944
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2960
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2976
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2992
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3008
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3024
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3040
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3056
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3072
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3088
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3104
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3120
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3136
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3152
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3168
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3184
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3200
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3216
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3232
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3248
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3264
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3280
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3296
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3312
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3328
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3344
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3360
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3376
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3392
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3408
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3424
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3440
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3456
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3472
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3488
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3504
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3520
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3536
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3552
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3568
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3584
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3600
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3616
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3632
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3648
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3664
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3680
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3696
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3712
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3728
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3744
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3760
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3776
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3792
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3808
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3824
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3840
-        image: "borders.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3872
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3888
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3904
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3920
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3936
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3952
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3968
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3984
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4000
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4016
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4032
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4048
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4064
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4080
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4096
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4112
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4128
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4144
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4160
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4176
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4192
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4208
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4224
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4240
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4256
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4272
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4288
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4304
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4320
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4336
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4352
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4368
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4384
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4400
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4416
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4432
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4448
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4464
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4480
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4496
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4512
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4528
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4544
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4560
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4576
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4592
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4608
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4624
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4640
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4656
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4672
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4688
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4704
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4720
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4736
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4752
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4768
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4784
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4800
-        image: "borders.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4832
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4848
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4864
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4880
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4896
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4912
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4928
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4944
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4960
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4976
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4992
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5008
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5024
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5040
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5056
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5072
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5088
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5104
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5120
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5136
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5152
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5168
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5184
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5200
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5216
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5232
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5248
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5264
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5280
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5296
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5312
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5328
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5344
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5360
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5376
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5392
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5408
-        hash: "ab9753116e289c932064144bb0845857"
+        hash: "258a7e75b491e4f51a91739c776803b3"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/particles.qml b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/particles.qml
index 2d481c9..fc8261f 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/particles.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/particles.qml
@@ -1,4 +1,5 @@
 import Qt 4.6
+import Qt.labs.particles 1.0
 
 Rectangle {
     width: 640; height: 480; color: "black"
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/repeater.qml b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/repeater.qml
deleted file mode 100644
index 1eb115d..0000000
--- a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/repeater.qml
+++ /dev/null
@@ -1,339 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 32
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 48
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 64
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 80
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 96
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 112
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 128
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 144
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 160
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 176
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 192
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 208
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 224
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 240
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 256
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 272
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 288
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 304
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 320
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 336
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 352
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 368
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 384
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 400
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 416
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 432
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 448
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 464
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 480
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 496
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 512
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 528
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 544
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 560
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 576
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 592
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 608
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 624
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 640
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 656
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 672
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 688
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 704
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 720
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 736
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 752
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 768
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 784
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 800
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 816
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 832
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 848
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 864
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 880
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 896
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 912
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 928
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 944
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 960
-        image: "repeater.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 992
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1008
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1024
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1040
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1056
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1072
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1088
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1104
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1120
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1136
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1152
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1168
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1184
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1200
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1216
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1232
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1248
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1264
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1280
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1296
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1312
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1328
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.qml b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.qml
new file mode 100644
index 0000000..1eb115d
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.qml
@@ -0,0 +1,339 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 32
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 48
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 64
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 80
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 96
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 112
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 128
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 144
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 160
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 176
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 192
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 208
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 224
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 240
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 256
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 272
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 288
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 304
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 320
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 336
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 352
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 368
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 384
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 400
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 416
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 432
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 448
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 464
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 480
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 496
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 512
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 528
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 544
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 560
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 576
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 592
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 608
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 624
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 640
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 656
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 672
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 688
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 704
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 720
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 736
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 752
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 768
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 784
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 800
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 816
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 832
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 848
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 864
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 880
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 896
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 912
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 928
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 944
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 960
+        image: "repeater.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 992
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1008
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1024
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1040
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1056
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1072
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1088
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1104
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1120
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1136
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1152
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1168
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1184
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1200
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1216
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1232
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1248
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1264
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1280
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1296
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1312
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1328
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/repeater.qml b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/repeater.qml
deleted file mode 100644
index ff60365..0000000
--- a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/repeater.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import Qt 4.6
-
-Item{
-    width: 200; height: 600
-    Column{
-        Rectangle{color:"Red"; width:40; height:40;}
-        Repeater{
-            id: rep
-            model: 3
-            delegate: Component{Rectangle{color:"Green"; width:40; height:40; radius: 20;}}
-        }
-        Rectangle{color:"Blue"; width:40; height:40;}
-    }
-    Timer{ interval: 500; running: true; onTriggered: rep.model=6;}
-}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/usingRepeater.qml b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/usingRepeater.qml
new file mode 100644
index 0000000..ff60365
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/usingRepeater.qml
@@ -0,0 +1,15 @@
+import Qt 4.6
+
+Item{
+    width: 200; height: 600
+    Column{
+        Rectangle{color:"Red"; width:40; height:40;}
+        Repeater{
+            id: rep
+            model: 3
+            delegate: Component{Rectangle{color:"Green"; width:40; height:40; radius: 20;}}
+        }
+        Rectangle{color:"Blue"; width:40; height:40;}
+    }
+    Timer{ interval: 500; running: true; onTriggered: rep.model=6;}
+}
diff --git a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
index 718e3a6..681b530 100644
--- a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
+++ b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
@@ -100,20 +100,35 @@ void tst_qmlvisual::visual_data()
     if (qgetenv("QMLVISUAL_ALL") != "")
         files << findQmlFiles(QDir(QT_TEST_SOURCE_DIR));
     else {
+        //these are newly added tests we want to try out in CI (then move to the stable list)
+        files << QT_TEST_SOURCE_DIR "/qdeclarativeborderimage/borders.qml";
+        files << QT_TEST_SOURCE_DIR "/qdeclarativeborderimage/animated.qml";
+        files << QT_TEST_SOURCE_DIR "/qdeclarativeborderimage/animated-smooth.qml";
+        files << QT_TEST_SOURCE_DIR "/qdeclarativeflipable/test-flipable.qml";
+        files << QT_TEST_SOURCE_DIR "/qdeclarativepositioners/usingRepeater.qml";
+
         //these are tests we think are stable and useful enough to be run by the CI system
         files << QT_TEST_SOURCE_DIR "/animation/bindinganimation/bindinganimation.qml";
-        files << QT_TEST_SOURCE_DIR "/animation/colorAnimation/colorAnimation-visual.qml";
-        files << QT_TEST_SOURCE_DIR "/animation/easing/easing.qml";
         files << QT_TEST_SOURCE_DIR "/animation/loop/loop.qml";
         files << QT_TEST_SOURCE_DIR "/animation/parallelAnimation/parallelAnimation-visual.qml";
         files << QT_TEST_SOURCE_DIR "/animation/parentAnimation/parentAnimation-visual.qml";
-        files << QT_TEST_SOURCE_DIR "/animation/pauseAnimation/pauseAnimation-visual.qml";
-        files << QT_TEST_SOURCE_DIR "/animation/propertyAction/propertyAction-visual.qml";
         files << QT_TEST_SOURCE_DIR "/animation/reanchor/reanchor.qml";
         files << QT_TEST_SOURCE_DIR "/animation/scriptAction/scriptAction-visual.qml";
-        files << QT_TEST_SOURCE_DIR "/qdeclarativemousearea/mousearea-visual.qml";
         files << QT_TEST_SOURCE_DIR "/qdeclarativemousearea/drag.qml";
         files << QT_TEST_SOURCE_DIR "/fillmode/fillmode.qml";
+
+        //these reliably fail in CI, for unknown reasons
+        //files << QT_TEST_SOURCE_DIR "/animation/easing/easing.qml";
+        //files << QT_TEST_SOURCE_DIR "/animation/pauseAnimation/pauseAnimation-visual.qml";
+
+        //these reliably fail on Linux because of color interpolation (different float rounding)
+#if !defined(Q_WS_X11) && !defined(Q_WS_QWS)
+        files << QT_TEST_SOURCE_DIR "/animation/colorAnimation/colorAnimation-visual.qml";
+        files << QT_TEST_SOURCE_DIR "/animation/propertyAction/propertyAction-visual.qml";
+#endif
+
+        //this is unstable because the MouseArea press-and-hold timer is not synchronized to the animation framework.
+        //files << QT_TEST_SOURCE_DIR "/qdeclarativemousearea/mousearea-visual.qml";
     }
 
     foreach (const QString &file, files) {
diff --git a/tools/qml/qdeclarativetester.cpp b/tools/qml/qdeclarativetester.cpp
index cf537ee..11fa22f 100644
--- a/tools/qml/qdeclarativetester.cpp
+++ b/tools/qml/qdeclarativetester.cpp
@@ -332,6 +332,24 @@ void QDeclarativeTester::updateCurrentTime(int msec)
                     qWarning() << "QDeclarativeTester: Image mismatch.  Reject saved to:" 
                                << reject;
                     img.save(reject);
+                    bool doDiff = (goodImage.size() == img.size());
+                    if (doDiff) {
+                        QImage diffimg(m_view->width(), m_view->height(), QImage::Format_RGB32);
+                        diffimg.fill(qRgb(255,255,255));
+                        QPainter p(&diffimg);
+                        int diffCount = 0;
+                        for (int x = 0; x < img.width(); ++x) {
+                            for (int y = 0; y < img.height(); ++y) {
+                                if (goodImage.pixel(x,y) != img.pixel(x,y)) {
+                                    ++diffCount;
+                                    p.drawPoint(x,y);
+                                }
+                            }
+                        }
+                        QString diff(frame->image().toLocalFile() + ".diff.png");
+                        diffimg.save(diff);
+                        qWarning().nospace() << "                    Diff (" << diffCount << " pixels differed) saved to: " << diff;
+                    }
                     imagefailure();
                 }
             }
-- 
cgit v0.12