Merge remote-tracking branch 'origin/5.6' into dev

Conflicts:
	src/qml/debugger/qqmldebug.cpp

Change-Id: I93de5a81b18cdece475870cf7cfba1b9baef2304

1 files changed, 31 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp b/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp
index 5c252013ea..519ee7ac26 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)
@@ -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"