1 files changed, 34 insertions, 3 deletions
diff --git a/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp b/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp
index 4d76fc4fba..d26c1c584b 100644
--- a/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp
+++ b/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp
@@ -125,6 +125,7 @@ private slots:
     void datetime();
     void datetime_data();
     void about_to_be_signals();
+    void modify_through_delegate();
 };
 
 bool tst_qqmllistmodel::compareVariantList(const QVariantList &testList, QVariant object)
@@ -624,7 +625,7 @@ void tst_qqmllistmodel::enumerate()
 
     int expectedStringCount = sizeof(expectedStrings) / sizeof(expectedStrings[0]);
 
-    QStringList r = item->property("result").toString().split(":");
+    QStringList r = item->property("result").toString().split(QLatin1Char(':'));
 
     int matchCount = 0;
     for (int i=0 ; i < expectedStringCount ; ++i) {
@@ -642,7 +643,7 @@ void tst_qqmllistmodel::enumerate()
         }
     }
 
-    QVERIFY(matchCount == expectedStringCount);
+    QCOMPARE(matchCount, expectedStringCount);
 
     delete item;
 }
@@ -1296,7 +1297,7 @@ void tst_qqmllistmodel::datetime()
     QQmlExpression e(engine.rootContext(), &model, qml);
     QVariant result = e.evaluate();
     QDateTime dtResult = result.toDateTime();
-    QVERIFY(expected == dtResult);
+    QCOMPARE(expected, dtResult);
 }
 
 class RowTester : public QObject
@@ -1427,6 +1428,36 @@ void tst_qqmllistmodel::about_to_be_signals()
     QCOMPARE(tester.rowsRemovedCount, 0);
 }
 
+void tst_qqmllistmodel::modify_through_delegate()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine);
+    component.setData(
+        "import QtQuick 2.0\n"
+        "Item {\n"
+        "   ListModel {\n"
+        "       id: testModel\n"
+        "       objectName: \"testModel\"\n"
+        "       ListElement { name: \"Joe\"; age: 22 }\n"
+        "       ListElement { name: \"Doe\"; age: 33 }\n"
+        "   }\n"
+        "   ListView {\n"
+        "       model: testModel\n"
+        "       delegate: Item {\n"
+        "           Component.onCompleted: model.age = 18;\n"
+        "       }\n"
+        "   }\n"
+        "}\n", QUrl());
+
+    QObject *scene = component.create();
+    QQmlListModel *model = scene->findChild<QQmlListModel*>("testModel");
+
+    const QHash<int, QByteArray> roleNames = model->roleNames();
+
+    QCOMPARE(model->data(model->index(0, 0, QModelIndex()), roleNames.key("age")).toInt(), 18);
+    QCOMPARE(model->data(model->index(1, 0, QModelIndex()), roleNames.key("age")).toInt(), 18);
+}
+
 QTEST_MAIN(tst_qqmllistmodel)
 
 #include "tst_qqmllistmodel.moc"