Merge remote-tracking branch 'origin/tqtc/lts-5.15.12' into tqtc/lts-5.15-opensourcev5.15.12-lts-lgpl

Change-Id: Ia60d01835108b0a461791e56388eb3dfe90649e2

1 files changed, 15 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
index 27bd8aae49..83bdb1a5f8 100644
--- a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
+++ b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
@@ -434,6 +434,7 @@ private slots:
     void invalidContext();
     void externalManagedModel();
     void delegateModelChangeDelegate();
+    void noDoubleDelegateUpdate();
     void checkFilterGroupForDelegate();
     void readFromProxyObject();
 
@@ -4345,6 +4346,20 @@ void tst_qquickvisualdatamodel::delegateModelChangeDelegate()
     QCOMPARE(visualModel->count(), 3);
 }
 
+void tst_qquickvisualdatamodel::noDoubleDelegateUpdate()
+{
+    // changing a delegate only refreshes its instances once
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFileUrl("setDelegateNoDoubleChange.qml"));
+
+    QScopedPointer<QObject> root(component.create());
+    QVERIFY(root);
+
+    bool ok = root->setProperty("testStarted", true);
+    QVERIFY(ok);
+    QCOMPARE(root->property("creationCount").toInt(), 1);
+}
+
 void tst_qquickvisualdatamodel::checkFilterGroupForDelegate()
 {
     QQuickView view;