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: (36 commits)
  Doc improvements
  Disable mouse-based selection in TextInput/TextEdit
  Rename qml executable to qmlviewer
  Don't crash if the target parent is destroyed.
  Introduce a threaded interpreter for QML binding bytecode
  Bug moved.
  doc
  doc
  Remove image example (covered in class docs)
  When changing Loader source, remove old item from scene immediately.
  Add missing .qmlproject files
  Fix folderlistmodel with qt namespace
  Renaming "Qml Launcher"  back to "QML Viewer"
  Rename some examples: proxyviewer -> networkaccessmanagerfactory,
  Regression fix for Loader anchors not working
  Make Qt.include() work for js files that have '.pragma library'
  doc fix
  Improve docs for Qt.quit()
  Prevent assignment of values (string, number, bool)  to signal handlers.
  Make sure strings are escaped when returned via asScript.
  ...

36 files changed, 1412 insertions, 30 deletions

diff --git a/tests/auto/declarative/.gitignore b/tests/.gitignore
index 57608cf..b203473 100644
--- a/tests/auto/declarative/.gitignore
+++ b/tests/.gitignore
@@ -1,3 +1,4 @@
+QObject.log
 tst_*
 !tst_*.*
 tst_*.log
diff --git a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
index 851460f..7f0e6c0 100644
--- a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
+++ b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
@@ -398,7 +398,7 @@ void tst_qdeclarativecontext::destruction()
 
     QObject obj;
     QDeclarativeEngine::setContextForObject(&obj, ctxt);
-    QDeclarativeExpression expr(ctxt, "a", 0);
+    QDeclarativeExpression expr(ctxt, 0, "a");
 
     QCOMPARE(ctxt, QDeclarativeEngine::contextForObject(&obj));
     QCOMPARE(ctxt, expr.context());
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_pragma.qml b/tests/auto/declarative/qdeclarativeecmascript/data/include_pragma.qml
new file mode 100644
index 0000000..67b8cfd
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/include_pragma.qml
@@ -0,0 +1,11 @@
+import Qt 4.7
+import "include_pragma_outer.js" as Script
+
+Item {
+    property int test1
+
+    Component.onCompleted: {
+        test1 = Script.callFunction()
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_pragma_inner.js b/tests/auto/declarative/qdeclarativeecmascript/data/include_pragma_inner.js
new file mode 100644
index 0000000..a0380a2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/include_pragma_inner.js
@@ -0,0 +1,5 @@
+.pragma library
+
+function getValue() {
+    return 100;
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_pragma_outer.js b/tests/auto/declarative/qdeclarativeecmascript/data/include_pragma_outer.js
new file mode 100644
index 0000000..d87bafc
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/include_pragma_outer.js
@@ -0,0 +1,6 @@
+Qt.include("include_pragma_inner.js")
+
+function callFunction() {
+    return getValue();
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
index 1381d57..7bb8a8e 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
+++ b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
@@ -190,7 +190,7 @@ class MyExpression : public QDeclarativeExpression
     Q_OBJECT
 public:
     MyExpression(QDeclarativeContext *ctxt, const QString &expr)
-        : QDeclarativeExpression(ctxt, expr, 0), changed(false)
+        : QDeclarativeExpression(ctxt, 0, expr), changed(false)
     {
         QObject::connect(this, SIGNAL(valueChanged()), this, SLOT(expressionValueChanged()));
         setNotifyOnValueChanged(true);
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 64e5b3f..9a88237 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -2083,10 +2083,9 @@ void tst_qdeclarativeecmascript::compiled()
     QCOMPARE(object->property("test15").toBool(), false);
     QCOMPARE(object->property("test16").toBool(), true);
 
-    QCOMPARE(object->property("test17").toInt(), 4);
+    QCOMPARE(object->property("test17").toInt(), 5);
     QCOMPARE(object->property("test18").toReal(), qreal(176));
-    QEXPECT_FAIL("", "QTBUG-9538", Continue);
-    QCOMPARE(object->property("test19").toInt(), 6);
+    QCOMPARE(object->property("test19").toInt(), 7);
     QCOMPARE(object->property("test20").toReal(), qreal(6.7));
     QCOMPARE(object->property("test21").toString(), QLatin1String("6.7"));
     QCOMPARE(object->property("test22").toString(), QLatin1String("!"));
@@ -2425,6 +2424,17 @@ void tst_qdeclarativeecmascript::include()
     delete o;
     }
 
+    // Including file with ".pragma library"
+    {
+    QDeclarativeComponent component(&engine, TEST_FILE("include_pragma.qml"));
+    qDebug() << "errors:" << component.errorsString();
+    QObject *o = component.create();
+    QVERIFY(o != 0);
+    QCOMPARE(o->property("test1").toInt(), 100);
+
+    delete o;
+    }
+
     // Remote - success
     {
     TestHTTPServer server(8111);
diff --git a/tests/auto/declarative/qdeclarativefolderlistmodel/data/basic.qml b/tests/auto/declarative/qdeclarativefolderlistmodel/data/basic.qml
new file mode 100644
index 0000000..2c4977d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativefolderlistmodel/data/basic.qml
@@ -0,0 +1,5 @@
+import Qt.labs.folderlistmodel 1.0
+
+FolderListModel {
+    nameFilters: [ "*.qml" ]
+}
diff --git a/tests/auto/declarative/qdeclarativefolderlistmodel/data/dummy.qml b/tests/auto/declarative/qdeclarativefolderlistmodel/data/dummy.qml
new file mode 100644
index 0000000..609638b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativefolderlistmodel/data/dummy.qml
@@ -0,0 +1 @@
+// This file is not used, it is just content for QDirModel
diff --git a/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro b/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro
new file mode 100644
index 0000000..487d0e1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro
@@ -0,0 +1,17 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativefolderlistmodel.cpp
+
+# Define SRCDIR equal to test's source directory
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
+
+CONFIG += parallel_test
diff --git a/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp b/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp
new file mode 100644
index 0000000..8a8bfe7
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** 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 <QtTest/QSignalSpy>
+#include "../../../shared/util.h"
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qabstractitemmodel.h>
+#include <QDebug>
+
+// From qdeclarastivefolderlistmodel.h
+const int FileNameRole = Qt::UserRole+1;
+const int FilePathRole = Qt::UserRole+2;
+enum SortField { Unsorted, Name, Time, Size, Type };
+
+class tst_qdeclarativefolderlistmodel : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qdeclarativefolderlistmodel() {}
+
+private slots:
+    void basicProperties();
+
+private:
+    void checkNoErrors(const QDeclarativeComponent& component);
+    QDeclarativeEngine engine;
+};
+
+void tst_qdeclarativefolderlistmodel::checkNoErrors(const QDeclarativeComponent& component)
+{
+    // Wait until the component is ready
+    QTRY_VERIFY(component.isReady() || component.isError());
+
+    if (component.isError()) {
+        QList<QDeclarativeError> errors = component.errors();
+        for (int ii = 0; ii < errors.count(); ++ii) {
+            const QDeclarativeError &error = errors.at(ii);
+            QByteArray errorStr = QByteArray::number(error.line()) + ":" +
+                                  QByteArray::number(error.column()) + ":" +
+                                  error.description().toUtf8();
+            qWarning() << errorStr;
+        }
+    }
+    QVERIFY(!component.isError());
+}
+
+void tst_qdeclarativefolderlistmodel::basicProperties()
+{
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/basic.qml"));
+    checkNoErrors(component);
+
+    QAbstractListModel *flm = qobject_cast<QAbstractListModel*>(component.create());
+    QVERIFY(flm != 0);
+
+
+    flm->setProperty("folder",QUrl::fromLocalFile(SRCDIR "/data"));
+    QTRY_COMPARE(flm->property("count").toInt(),2); // wait for refresh
+    QCOMPARE(flm->property("folder").toUrl(), QUrl::fromLocalFile(SRCDIR "/data"));
+    QCOMPARE(flm->property("parentFolder").toUrl(), QUrl::fromLocalFile(SRCDIR));
+    QCOMPARE(flm->property("sortField").toInt(), int(Name));
+    QCOMPARE(flm->property("nameFilters").toStringList(), QStringList() << "*.qml");
+    QCOMPARE(flm->property("sortReversed").toBool(), false);
+    QCOMPARE(flm->property("showDirs").toBool(), true);
+    QCOMPARE(flm->property("showDotAndDotDot").toBool(), false);
+    QCOMPARE(flm->property("showOnlyReadable").toBool(), false);
+    QCOMPARE(flm->data(flm->index(0),FileNameRole).toString(), QLatin1String("basic.qml"));
+    QCOMPARE(flm->data(flm->index(1),FileNameRole).toString(), QLatin1String("dummy.qml"));
+}
+
+QTEST_MAIN(tst_qdeclarativefolderlistmodel)
+
+#include "tst_qdeclarativefolderlistmodel.moc"
diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
index e0143a6..720702a 100644
--- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
+++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
@@ -400,7 +400,7 @@ T *tst_qdeclarativeimage::findItem(QGraphicsObject *parent, const QString &objec
         //qDebug() << "try" << item;
         if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
             if (index != -1) {
-                QDeclarativeExpression e(qmlContext(item), "index", item);
+                QDeclarativeExpression e(qmlContext(item), item, "index");
                 if (e.evaluate().toInt() == index)
                     return static_cast<T*>(item);
             } else {
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignValueToSignal.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/assignValueToSignal.errors.txt
new file mode 100644
index 0000000..eb1430a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignValueToSignal.errors.txt
@@ -0,0 +1 @@
+4:5:Cannot assign a value to a signal (expecting a script to be run)
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignValueToSignal.qml
index c84fea3..6fa1259 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignValueToSignal.qml
@@ -1,7 +1,6 @@
 import Test 1.0
 
 MyQmlObject {
-    onBasicSignal {
-    }
+    onBasicSignal: "hello world"
 }
 
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.2.errors.txt
deleted file mode 100644
index 8b20434..0000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:5:Incorrectly specified signal assignment
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.errors.txt
index 353bbf5..8b20434 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.errors.txt
@@ -1 +1 @@
-4:5:Empty signal assignment
+4:5:Incorrectly specified signal assignment
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.qml b/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.qml
index 4c5a122..c84fea3 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.qml
@@ -1,6 +1,7 @@
 import Test 1.0
 
 MyQmlObject {
-    onBasicSignal: " " 
+    onBasicSignal {
+    }
 }
 
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/scriptString2.qml b/tests/auto/declarative/qdeclarativelanguage/data/scriptString2.qml
new file mode 100644
index 0000000..c42da2b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/scriptString2.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+
+MyTypeObject {
+    scriptProperty: "hello\n\"world\""
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/scriptString3.qml b/tests/auto/declarative/qdeclarativelanguage/data/scriptString3.qml
new file mode 100644
index 0000000..0cd82ff
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/scriptString3.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+
+MyTypeObject {
+    scriptProperty: 12.345
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/scriptString4.qml b/tests/auto/declarative/qdeclarativelanguage/data/scriptString4.qml
new file mode 100644
index 0000000..3e2f9a4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/scriptString4.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+
+MyTypeObject {
+    scriptProperty: true
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index 6b070f5..200f016 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -351,8 +351,8 @@ void tst_qdeclarativelanguage::errors_data()
     QTest::newRow("invalidAttachedProperty.12") << "invalidAttachedProperty.12.qml" << "invalidAttachedProperty.12.errors.txt" << false;
     QTest::newRow("invalidAttachedProperty.13") << "invalidAttachedProperty.13.qml" << "invalidAttachedProperty.13.errors.txt" << false;
 
+    QTest::newRow("assignValueToSignal") << "assignValueToSignal.qml" << "assignValueToSignal.errors.txt" << false;
     QTest::newRow("emptySignal") << "emptySignal.qml" << "emptySignal.errors.txt" << false;
-    QTest::newRow("emptySignal.2") << "emptySignal.2.qml" << "emptySignal.2.errors.txt" << false;
 
     QTest::newRow("nestedErrors") << "nestedErrors.qml" << "nestedErrors.errors.txt" << false;
     QTest::newRow("defaultGrouped") << "defaultGrouped.qml" << "defaultGrouped.errors.txt" << false;
@@ -1105,19 +1105,48 @@ void tst_qdeclarativelanguage::onDestruction()
 // Check that assignments to QDeclarativeScriptString properties work
 void tst_qdeclarativelanguage::scriptString()
 {
-    QDeclarativeComponent component(&engine, TEST_FILE("scriptString.qml"));
-    VERIFY_ERRORS(0);
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("scriptString.qml"));
+        VERIFY_ERRORS(0);
 
-    MyTypeObject *object = qobject_cast<MyTypeObject*>(component.create());
-    QVERIFY(object != 0);
-    QCOMPARE(object->scriptProperty().script(), QString("foo + bar"));
-    QCOMPARE(object->scriptProperty().scopeObject(), qobject_cast<QObject*>(object));
-    QCOMPARE(object->scriptProperty().context(), qmlContext(object));
-
-    QVERIFY(object->grouped() != 0);
-    QCOMPARE(object->grouped()->script().script(), QString("console.log(1921)"));
-    QCOMPARE(object->grouped()->script().scopeObject(), qobject_cast<QObject*>(object));
-    QCOMPARE(object->grouped()->script().context(), qmlContext(object));
+        MyTypeObject *object = qobject_cast<MyTypeObject*>(component.create());
+        QVERIFY(object != 0);
+        QCOMPARE(object->scriptProperty().script(), QString("foo + bar"));
+        QCOMPARE(object->scriptProperty().scopeObject(), qobject_cast<QObject*>(object));
+        QCOMPARE(object->scriptProperty().context(), qmlContext(object));
+
+        QVERIFY(object->grouped() != 0);
+        QCOMPARE(object->grouped()->script().script(), QString("console.log(1921)"));
+        QCOMPARE(object->grouped()->script().scopeObject(), qobject_cast<QObject*>(object));
+        QCOMPARE(object->grouped()->script().context(), qmlContext(object));
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("scriptString2.qml"));
+        VERIFY_ERRORS(0);
+
+        MyTypeObject *object = qobject_cast<MyTypeObject*>(component.create());
+        QVERIFY(object != 0);
+        QCOMPARE(object->scriptProperty().script(), QString("\"hello\\n\\\"world\\\"\""));
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("scriptString3.qml"));
+        VERIFY_ERRORS(0);
+
+        MyTypeObject *object = qobject_cast<MyTypeObject*>(component.create());
+        QVERIFY(object != 0);
+        QCOMPARE(object->scriptProperty().script(), QString("12.345"));
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("scriptString4.qml"));
+        VERIFY_ERRORS(0);
+
+        MyTypeObject *object = qobject_cast<MyTypeObject*>(component.create());
+        QVERIFY(object != 0);
+        QCOMPARE(object->scriptProperty().script(), QString("true"));
+    }
 }
 
 // Check that default property assignments are correctly spliced into explicit 
diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
index 26a12f0..be4ffe8 100644
--- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
@@ -275,7 +275,7 @@ void tst_qdeclarativelistmodel::dynamic()
     QDeclarativeListModel model;
     QDeclarativeEngine::setContextForObject(&model,engine.rootContext());
     engine.rootContext()->setContextObject(&model);
-    QDeclarativeExpression e(engine.rootContext(), script, &model);
+    QDeclarativeExpression e(engine.rootContext(), &model, script);
     if (!warning.isEmpty())
         QTest::ignoreMessage(QtWarningMsg, warning.toLatin1());
 
@@ -332,7 +332,7 @@ void tst_qdeclarativelistmodel::dynamic_worker()
                 Q_ARG(QVariant, operations.mid(0, operations.length()-1))));
         waitForWorker(item);
 
-        QDeclarativeExpression e(eng.rootContext(), operations.last().toString(), &model);
+        QDeclarativeExpression e(eng.rootContext(), &model, operations.last().toString());
         if (QByteArray(QTest::currentDataTag()).startsWith("nested"))
             QVERIFY(e.evaluate().toInt() != result);
         else
diff --git a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
index ec2afae..fde2e43 100644
--- a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
+++ b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
@@ -1550,7 +1550,7 @@ T *tst_QDeclarativeListView::findItem(QGraphicsObject *parent, const QString &ob
         //qDebug() << "try" << item;
         if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
             if (index != -1) {
-                QDeclarativeExpression e(qmlContext(item), "index", item);
+                QDeclarativeExpression e(qmlContext(item), item, "index");
                 if (e.evaluate().toInt() == index)
                     return static_cast<T*>(item);
             } else {
diff --git a/tests/auto/declarative/qdeclarativeloader/data/AnchoredLoader.qml b/tests/auto/declarative/qdeclarativeloader/data/AnchoredLoader.qml
new file mode 100644
index 0000000..5d02dae
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeloader/data/AnchoredLoader.qml
@@ -0,0 +1,14 @@
+import Qt 4.7
+
+Rectangle {
+    width: 300
+    height: 200
+    color: "blue"
+    Loader {
+        objectName: "loader"
+        anchors.fill: parent
+        sourceComponent: Component {
+            Rectangle { color: "red"; objectName: "sourceElement" }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
index 59580ea..11cc61b 100644
--- a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
+++ b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
@@ -78,6 +78,7 @@ private slots:
     void clear();
     void urlToComponent();
     void componentToUrl();
+    void anchoredLoader();
     void sizeLoaderToItem();
     void sizeItemToLoader();
     void noResize();
@@ -266,6 +267,27 @@ void tst_QDeclarativeLoader::componentToUrl()
     delete item;
 }
 
+void tst_QDeclarativeLoader::anchoredLoader()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("/AnchoredLoader.qml"));
+    QDeclarativeItem *rootItem = qobject_cast<QDeclarativeItem*>(component.create());
+    QVERIFY(rootItem != 0);
+    QDeclarativeItem *loader = rootItem->findChild<QDeclarativeItem*>("loader");
+    QDeclarativeItem *sourceElement = rootItem->findChild<QDeclarativeItem*>("sourceElement");
+
+    QVERIFY(loader != 0);
+    QVERIFY(sourceElement != 0);
+
+    QCOMPARE(rootItem->width(), 300.0);
+    QCOMPARE(rootItem->height(), 200.0);
+
+    QCOMPARE(loader->width(), 300.0);
+    QCOMPARE(loader->height(), 200.0);
+
+    QCOMPARE(sourceElement->width(), 300.0);
+    QCOMPARE(sourceElement->height(), 200.0);
+}
+
 void tst_QDeclarativeLoader::sizeLoaderToItem()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("/SizeToItem.qml"));
diff --git a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
index 0e16f66..f32a6c7 100644
--- a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
+++ b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
@@ -760,7 +760,7 @@ T *tst_QDeclarativePathView::findItem(QGraphicsObject *parent, const QString &ob
         //qDebug() << "try" << item;
         if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
             if (index != -1) {
-                QDeclarativeExpression e(qmlContext(item), "index", item);
+                QDeclarativeExpression e(qmlContext(item), item, "index");
                 if (e.evaluate().toInt() == index)
                     return static_cast<T*>(item);
             } else {
diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
index c65c883..4befc4c 100644
--- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
+++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
@@ -76,6 +76,8 @@ private slots:
     void persistentSelection();
     void focusOnPress();
     void selection();
+    void mouseSelection_data();
+    void mouseSelection();
     void inputMethodHints();
 
     void cursorDelegate();
@@ -602,6 +604,49 @@ void tst_qdeclarativetextedit::selection()
     QVERIFY(textEditObject->selectedText().size() == 10);
 }
 
+void tst_qdeclarativetextedit::mouseSelection_data()
+{
+    QTest::addColumn<QString>("qmlfile");
+    QTest::addColumn<bool>("expectSelection");
+
+    // import installed
+    QTest::newRow("on") << SRCDIR "/data/mouseselection_true.qml" << true;
+    QTest::newRow("off") << SRCDIR "/data/mouseselection_false.qml" << false;
+    QTest::newRow("default") << SRCDIR "/data/mouseselection_default.qml" << false;
+}
+
+void tst_qdeclarativetextedit::mouseSelection()
+{
+    QFETCH(QString, qmlfile);
+    QFETCH(bool, expectSelection);
+
+    QDeclarativeView *canvas = createView(qmlfile);
+
+    canvas->show();
+    QApplication::setActiveWindow(canvas);
+    QTest::qWaitForWindowShown(canvas);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(canvas));
+
+    QVERIFY(canvas->rootObject() != 0);
+    QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit *>(canvas->rootObject());
+    QVERIFY(textEditObject != 0);
+
+    // press-and-drag-and-release from x1 to x2
+    int x1 = 10;
+    int x2 = 70;
+    int y = textEditObject->height()/2;
+    QTest::mousePress(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(x1,y)));
+    //QTest::mouseMove(canvas->viewport(), canvas->mapFromScene(QPoint(x2,y))); // doesn't work
+    QMouseEvent mv(QEvent::MouseMove, canvas->mapFromScene(QPoint(x2,y)), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
+    QApplication::sendEvent(canvas->viewport(), &mv);
+    QTest::mouseRelease(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(x2,y)));
+    QString str = textEditObject->selectedText();
+    if (expectSelection)
+        QVERIFY(str.length() > 3); // don't reallly care *what* was selected (and it's too sensitive to platform)
+    else
+        QVERIFY(str.isEmpty());
+}
+
 void tst_qdeclarativetextedit::inputMethodHints()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/inputmethodhints.qml");
diff --git a/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp b/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp
index c238ef9..8f3fb16 100644
--- a/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp
+++ b/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp
@@ -190,7 +190,7 @@ T *tst_qdeclarativevisualdatamodel::findItem(QGraphicsObject *parent, const QStr
         //qDebug() << "try" << item;
         if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
             if (index != -1) {
-                QDeclarativeExpression e(qmlContext(item), "index", item);
+                QDeclarativeExpression e(qmlContext(item), item, "index");
                 if (e.evaluate().toInt() == index)
                     return static_cast<T*>(item);
             } else {
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
index 831e318..4173a44 100644
--- a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
@@ -238,7 +238,7 @@ void tst_qdeclarativexmllistmodel::roleErrors()
     QCOMPARE(data.value(Qt::UserRole+1), QVariant());
     QCOMPARE(data.value(Qt::UserRole+2), QVariant());
 
-    QEXPECT_FAIL("", "QT-2456", Continue);
+    QEXPECT_FAIL("", "QTBUG-10797", Continue);
     QCOMPARE(data.value(Qt::UserRole+3), QVariant());
 
     delete model;
diff --git a/tests/auto/declarative/qmlvisual/animation/parentAnimation2/data/parentAnimation2.0.png b/tests/auto/declarative/qmlvisual/animation/parentAnimation2/data/parentAnimation2.0.png
new file mode 100644
index 0000000..135911c
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/animation/parentAnimation2/data/parentAnimation2.0.png
diff --git a/tests/auto/declarative/qmlvisual/animation/parentAnimation2/data/parentAnimation2.1.png b/tests/auto/declarative/qmlvisual/animation/parentAnimation2/data/parentAnimation2.1.png
new file mode 100644
index 0000000..0d71292
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/animation/parentAnimation2/data/parentAnimation2.1.png
diff --git a/tests/auto/declarative/qmlvisual/animation/parentAnimation2/data/parentAnimation2.2.png b/tests/auto/declarative/qmlvisual/animation/parentAnimation2/data/parentAnimation2.2.png
new file mode 100644
index 0000000..920d992
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/animation/parentAnimation2/data/parentAnimation2.2.png
diff --git a/tests/auto/declarative/qmlvisual/animation/parentAnimation2/data/parentAnimation2.3.png b/tests/auto/declarative/qmlvisual/animation/parentAnimation2/data/parentAnimation2.3.png
new file mode 100644
index 0000000..1c4d89e
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/animation/parentAnimation2/data/parentAnimation2.3.png
diff --git a/tests/auto/declarative/qmlvisual/animation/parentAnimation2/data/parentAnimation2.qml b/tests/auto/declarative/qmlvisual/animation/parentAnimation2/data/parentAnimation2.qml
new file mode 100644
index 0000000..9e1b923
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/animation/parentAnimation2/data/parentAnimation2.qml
@@ -0,0 +1,1023 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 32
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 48
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 64
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 80
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 96
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 112
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 128
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 144
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 160
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 176
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 192
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 208
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 224
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 240
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 256
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 272
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 288
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 304
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 320
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 336
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 352
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 368
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 384
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 400
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 416
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 432
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 448
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 464
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 480
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 496
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 512
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 528
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 544
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 560
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 576
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 592
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 608
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 624
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 640
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 656
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 672
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 688
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 704
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 350; y: 182
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 720
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 736
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 752
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 768
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 784
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 800
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 350; y: 182
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 816
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 832
+        hash: "9b524b546d250d239ea99dd3319f3d6a"
+    }
+    Frame {
+        msec: 848
+        hash: "593300f166c2fd3c325cb35114ca595b"
+    }
+    Frame {
+        msec: 864
+        hash: "4451e76e111c99faa77b5fff9a2642fa"
+    }
+    Frame {
+        msec: 880
+        hash: "0b4a5675afba935e17eba19e29b709ee"
+    }
+    Frame {
+        msec: 896
+        hash: "8682866f0234eebf25aca27a7737c777"
+    }
+    Frame {
+        msec: 912
+        hash: "5b3b70dd366bb4c1b5e7d56ce50e59a6"
+    }
+    Frame {
+        msec: 928
+        hash: "897394982c93ebcbea68c25cec6d47d3"
+    }
+    Frame {
+        msec: 944
+        hash: "23c3c0383a517d33767adeebc53bfa3a"
+    }
+    Frame {
+        msec: 960
+        image: "parentAnimation2.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "95b4fe1e5eeffe1673e199308e8ce76c"
+    }
+    Frame {
+        msec: 992
+        hash: "dbb9a5aa9f569b97711aa2c1f5ebda47"
+    }
+    Frame {
+        msec: 1008
+        hash: "0a5a73409b019e650ea860e1a8e27328"
+    }
+    Frame {
+        msec: 1024
+        hash: "496bd0d053522bcf71d506b497ede0d5"
+    }
+    Frame {
+        msec: 1040
+        hash: "97a32b4a6c99ffe842c35e903bd23d79"
+    }
+    Frame {
+        msec: 1056
+        hash: "496dfbbb0c0c28e108adf4c25341ef11"
+    }
+    Frame {
+        msec: 1072
+        hash: "aa2e5eb88b1498f0d36897be2a36b0ff"
+    }
+    Frame {
+        msec: 1088
+        hash: "0c6f7b54264ab36cfd5145fb7b30432f"
+    }
+    Frame {
+        msec: 1104
+        hash: "797fc3ea1db51f12d900b4e0e4998065"
+    }
+    Frame {
+        msec: 1120
+        hash: "2b076b8bc1ec1e2f21a4d7a77c94cfeb"
+    }
+    Frame {
+        msec: 1136
+        hash: "8d5888ca1cfba19cea569bd38bada417"
+    }
+    Frame {
+        msec: 1152
+        hash: "15ae94de5aa106eaa18d0faefa5d61f5"
+    }
+    Frame {
+        msec: 1168
+        hash: "96e90d74d5a7788d5a6da6cfdb92b185"
+    }
+    Frame {
+        msec: 1184
+        hash: "5698a5e9e628209fc28644198eac65da"
+    }
+    Frame {
+        msec: 1200
+        hash: "074ac8f08de8f22c241e23ad8b89b0f0"
+    }
+    Frame {
+        msec: 1216
+        hash: "a49fdf41e9ee1e5d764262d4585af2ff"
+    }
+    Frame {
+        msec: 1232
+        hash: "accc9b6573a676a40fcf0129085f6fce"
+    }
+    Frame {
+        msec: 1248
+        hash: "1cc956d55f0c382c2f74dcc05a05494f"
+    }
+    Frame {
+        msec: 1264
+        hash: "38ff3121566b2c719f47d027fcef8b8e"
+    }
+    Frame {
+        msec: 1280
+        hash: "4de97b3361a16ca1710f2e75d5c9de6f"
+    }
+    Frame {
+        msec: 1296
+        hash: "dbd1455105630bb8f262140e79ceda1b"
+    }
+    Frame {
+        msec: 1312
+        hash: "bcdac4ab71a29b78bfa756b56b8d8414"
+    }
+    Frame {
+        msec: 1328
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1344
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1360
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1376
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1392
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1408
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1424
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1440
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1456
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1472
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1488
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1504
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1520
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1536
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1552
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1568
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1584
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1600
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1616
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1632
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1648
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1664
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1680
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1696
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1712
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 415; y: 121
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1728
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1744
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1760
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1776
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1792
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1808
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1824
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 415; y: 121
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1840
+        hash: "f02f73a85532c1dd403d64c50c7e73ca"
+    }
+    Frame {
+        msec: 1856
+        hash: "b59fbcfb7db77cf30ea4ff039a9163ae"
+    }
+    Frame {
+        msec: 1872
+        hash: "432a76f0663bfd35f6bbeb3fbeb91799"
+    }
+    Frame {
+        msec: 1888
+        hash: "098e18005d3a2ff9095587954c92339c"
+    }
+    Frame {
+        msec: 1904
+        hash: "069100bf4ec523a9e9d5bf557ffc51d1"
+    }
+    Frame {
+        msec: 1920
+        image: "parentAnimation2.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "60ed700e49bf2c51aba9b44400b56294"
+    }
+    Frame {
+        msec: 1952
+        hash: "79aa15dc74668d963f36f28524f4d091"
+    }
+    Frame {
+        msec: 1968
+        hash: "6838cb2d728259adc8d91a4a69e35adf"
+    }
+    Frame {
+        msec: 1984
+        hash: "3f73c720ce5f1e65fb8537a9beb66d26"
+    }
+    Frame {
+        msec: 2000
+        hash: "95d990ccd3e45e780d875aae1f4654f8"
+    }
+    Frame {
+        msec: 2016
+        hash: "5389a121571f61e73903305860e60016"
+    }
+    Frame {
+        msec: 2032
+        hash: "66f0018b6f35c1c18b28f4959eef96a8"
+    }
+    Frame {
+        msec: 2048
+        hash: "c0fa0560a9a5a0f773394c4fd98c9fa3"
+    }
+    Frame {
+        msec: 2064
+        hash: "e2d665ae0ac3007520003bb4a24ca708"
+    }
+    Frame {
+        msec: 2080
+        hash: "ab6e6976e4214c725f71a4f0ba6d3f68"
+    }
+    Frame {
+        msec: 2096
+        hash: "642f48f731f896d0d4b66956485b615b"
+    }
+    Frame {
+        msec: 2112
+        hash: "cdc36222978e4361dd3ddc2cba78328d"
+    }
+    Frame {
+        msec: 2128
+        hash: "22fe869d83d9d290c4d1702e7553c7aa"
+    }
+    Frame {
+        msec: 2144
+        hash: "3cf2b6a4fd5c73c24717a1ce901cfb19"
+    }
+    Frame {
+        msec: 2160
+        hash: "ea7ecad2a9b7e6ca9a9d1c9c46e0f6dc"
+    }
+    Frame {
+        msec: 2176
+        hash: "3a7e7e2145b40732ef4e18218a959536"
+    }
+    Frame {
+        msec: 2192
+        hash: "1386046373ab246ae533aba206ffe502"
+    }
+    Frame {
+        msec: 2208
+        hash: "2183072e2117c2bc660767bc67e6c355"
+    }
+    Frame {
+        msec: 2224
+        hash: "659c6fedf573d19727f9852a9034e4fe"
+    }
+    Frame {
+        msec: 2240
+        hash: "5be4e8fa87593aeb4d59768a61441c37"
+    }
+    Frame {
+        msec: 2256
+        hash: "2030b883508d07735b20726d218fd751"
+    }
+    Frame {
+        msec: 2272
+        hash: "fd70334fa8a1ff80369cce6aa69255c4"
+    }
+    Frame {
+        msec: 2288
+        hash: "be666aafc8a3d2de9ffaff54d9ac15d1"
+    }
+    Frame {
+        msec: 2304
+        hash: "3370f2246f679068e40cdb48c92decad"
+    }
+    Frame {
+        msec: 2320
+        hash: "f0b4565fd441c071112bdc8225861f76"
+    }
+    Frame {
+        msec: 2336
+        hash: "61babd82afc20a3023c2fe483a2e73cb"
+    }
+    Frame {
+        msec: 2352
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2368
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2384
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2400
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2416
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2432
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2448
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2464
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2480
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2496
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2512
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2528
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2544
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2560
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2576
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2592
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2608
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2624
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2640
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2656
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2672
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2688
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2704
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2720
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2736
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2752
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2768
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 207; y: 255
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2784
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2800
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2816
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2832
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2848
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2864
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2880
+        image: "parentAnimation2.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 207; y: 255
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2912
+        hash: "acab4a79f22ebc8a45759ae282e8f3db"
+    }
+    Frame {
+        msec: 2928
+        hash: "608af88c841d6058c3304cc134de0187"
+    }
+    Frame {
+        msec: 2944
+        hash: "96a727d6ff02c7baf85865fda9d871bd"
+    }
+    Frame {
+        msec: 2960
+        hash: "22cacf109e40b457041d6c2862c4f97f"
+    }
+    Frame {
+        msec: 2976
+        hash: "ea2a53381eef8ac75fce23c518f1e261"
+    }
+    Frame {
+        msec: 2992
+        hash: "a719237e74e9c40b46cc1f27cca5e286"
+    }
+    Frame {
+        msec: 3008
+        hash: "804ef3519ba9852afb0bd4ef793e0006"
+    }
+    Frame {
+        msec: 3024
+        hash: "4abc5026f0de1165717bd14630c9d9f6"
+    }
+    Frame {
+        msec: 3040
+        hash: "1e4dd04698691932725076073a0bd2e7"
+    }
+    Frame {
+        msec: 3056
+        hash: "12aae9dcfd9597ce600588b19bdf5a7d"
+    }
+    Frame {
+        msec: 3072
+        hash: "9176b69f7df68d860b7d7aecc2496f09"
+    }
+    Frame {
+        msec: 3088
+        hash: "9cba95a510685ab6367ba87246f6c922"
+    }
+    Frame {
+        msec: 3104
+        hash: "33ef448b9485fafb7a2af319f9f6e816"
+    }
+    Frame {
+        msec: 3120
+        hash: "791760db748e46aceb9f469c33b7bf2f"
+    }
+    Frame {
+        msec: 3136
+        hash: "201a00feef1bb445f2fd0ba8ef9467a1"
+    }
+    Frame {
+        msec: 3152
+        hash: "6e8962c3cb522f5a45b093f1780d2dae"
+    }
+    Frame {
+        msec: 3168
+        hash: "d75cb08203a4f2c05b4dfdca2196e3db"
+    }
+    Frame {
+        msec: 3184
+        hash: "0417d681c9b64e2cc252ab6fcf20148b"
+    }
+    Frame {
+        msec: 3200
+        hash: "85993e5a91a86cedb8c88819b035b6bb"
+    }
+    Frame {
+        msec: 3216
+        hash: "d7a0db647e641df9625b8eb5078a8ec3"
+    }
+    Frame {
+        msec: 3232
+        hash: "fa29824ed3fd3d4e0d8036079be6bcf8"
+    }
+    Frame {
+        msec: 3248
+        hash: "4fc84a3ae74bb6ab7b0b846c8747eb54"
+    }
+    Frame {
+        msec: 3264
+        hash: "a172921ffe15077382db8e8915fb340b"
+    }
+    Frame {
+        msec: 3280
+        hash: "480ee71d2407d729814a2e19d4320c59"
+    }
+    Frame {
+        msec: 3296
+        hash: "b8cf02a1ad96d5c3354f2b658085ed28"
+    }
+    Frame {
+        msec: 3312
+        hash: "80fc0f57f58250f63a77b1988a9e1d2e"
+    }
+    Frame {
+        msec: 3328
+        hash: "bc283b5d7c5b88ef447be5992a77b6a9"
+    }
+    Frame {
+        msec: 3344
+        hash: "89c86df88dc1a3188d52c1f75b80ccf1"
+    }
+    Frame {
+        msec: 3360
+        hash: "84148139d89b45949561321bd6f6c835"
+    }
+    Frame {
+        msec: 3376
+        hash: "9118d6933b3f77e0b5b8da2d630152e8"
+    }
+    Frame {
+        msec: 3392
+        hash: "2b5f746225053778fb07a606ff113e64"
+    }
+    Frame {
+        msec: 3408
+        hash: "0a1ed1bea6ed674826d0a2c3146a1c31"
+    }
+    Frame {
+        msec: 3424
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3440
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3456
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3472
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3488
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3504
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3520
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3536
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3552
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3568
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3584
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3600
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3616
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3632
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3648
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3664
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3680
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3696
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3712
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3728
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3744
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3760
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3776
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3792
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3808
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3824
+        hash: "b3bfd7a06d3e246f4256ab5a267360b0"
+    }
+    Frame {
+        msec: 3840
+        image: "parentAnimation2.3.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/animation/parentAnimation2/parentAnimation2.qml b/tests/auto/declarative/qmlvisual/animation/parentAnimation2/parentAnimation2.qml
new file mode 100644
index 0000000..dfab108
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/animation/parentAnimation2/parentAnimation2.qml
@@ -0,0 +1,64 @@
+import Qt 4.7
+
+/*
+Blue rect fills (with 10px margin) screen, then red, then green, then screen again.
+*/
+
+Rectangle {
+    id: whiteRect
+    width: 640; height: 480;
+
+    Rectangle {
+        id: redRect
+        x: 400; y: 50
+        width: 100; height: 100
+        color: "red"
+    }
+
+    Rectangle {
+        id: greenRect
+        x: 100; y: 150
+        width: 200; height: 300
+        color: "green"
+    }
+
+    Rectangle {
+        id: blueRect
+        x: 5; y: 5
+        width: parent.width-10
+        height: parent.height-10
+        color: "lightblue"
+
+        //Text { text: "Click me!"; anchors.centerIn: parent }
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: {
+            switch(blueRect.state) {
+                case "": blueRect.state = "inRed"; break;
+                case "inRed": blueRect.state = "inGreen"; break;
+                case "inGreen": blueRect.state = ""; break;
+                }
+            }
+        }
+
+        states: [
+            State {
+                name: "inRed"
+                ParentChange { target: blueRect; parent: redRect; x: 5; y: 5; width: parent.width-10; height: parent.height-10 }
+                PropertyChanges { target: redRect; z: 1 }
+            },
+            State {
+                name: "inGreen"
+                ParentChange { target: blueRect; parent: greenRect; x: 5; y: 5; width: parent.width-10; height: parent.height-10 }
+                PropertyChanges { target: greenRect; z: 1 }
+            }
+        ]
+
+        transitions: Transition {
+            ParentAnimation { target: blueRect; //via: whiteRect;
+                NumberAnimation { properties: "x, y, width, height"; duration: 500 }
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
index 4aad29b..f105692 100644
--- a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
+++ b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
@@ -105,6 +105,7 @@ void tst_qmlvisual::visual_data()
         files << QT_TEST_SOURCE_DIR "/qdeclarativeborderimage/animated.qml";
         files << QT_TEST_SOURCE_DIR "/qdeclarativeflipable/test-flipable.qml";
         files << QT_TEST_SOURCE_DIR "/qdeclarativepositioners/usingRepeater.qml";
+        files << QT_TEST_SOURCE_DIR "/animation/parentAnimation2/parentAnimation2.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";