Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (29 commits)
  Small calculator fix.
  Improve declarative calculator example.
  Update examples autotest to use the runtime directly
  Support valuetypes as method return values
  Compile without Qt3 support.
  Doc
  Simplify dynamic resource loading to avoid cluttering Text API.
  Add Component.onDestruction attached property
  Use qmlInfo for image loading errors, not qWarning().
  Visual test updates.
  Rename section so that it's not linked to by references to "JavaScript"
  Doc improvements
  Comments
  Remove unused parameter
  Correctly resolve, and load, IMG tags in Text element.
  Rename "sql" test so autotester doesn't get confused.
  Should work now, don't skip.
  ignore autotester logs
  Rename the ridiculous QDeclarativeDeclarativeData -> QDeclarativeData
  Rename QDeclarativeData -> QAbstractDeclarativeData
  ...

1 files changed, 14 insertions, 0 deletions

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;
+}