Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml

2 files changed, 5 insertions, 0 deletions

diff --git a/tests/auto/declarative/animations/tst_animations.cpp b/tests/auto/declarative/animations/tst_animations.cpp
index 239c344..5026f6f 100644
--- a/tests/auto/declarative/animations/tst_animations.cpp
+++ b/tests/auto/declarative/animations/tst_animations.cpp
@@ -424,6 +424,7 @@ void tst_animations::properties()
         QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect");
         QVERIFY(myRect);
         QTest::qWait(waitDuration);
+        QEXPECT_FAIL("", "QTBUG-8072", Continue);
         QTIMED_COMPARE(myRect->x(),qreal(100));
         QTIMED_COMPARE(myRect->y(),qreal(100));
     }
diff --git a/tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp b/tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp
index 1b05c0a..9d072dd 100644
--- a/tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp
+++ b/tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp
@@ -244,6 +244,10 @@ void tst_QmlListModel::error_data()
         << "import Qt 4.6\nListModel { ListElement { foo:123 } }"
         << "";
 
+    QTest::newRow("bindings not allowed in ListElement")
+        << "import Qt 4.6\nRectangle { id: rect; ListModel { ListElement { foo: rect.color } } }"
+        << "QTBUG-6203 ListElement should not allow binding its data to something";
+
     QTest::newRow("random object list properties allowed in ListElement")
         << "import Qt 4.6\nListModel { ListElement { foo: [ ListElement { bar: 123 } ] } }"
         << "";