Properly wire up change signal for QQuick3DRepeater's model

Ulf Hermann · Ulf Hermann · commit 7daf5940bb0b · 2025-09-18T13:23:34.000+02:00
If the model contents change we need to notify.

Pick-to: 6.10
Task-number: QTBUG-139941
Change-Id: I455deb52fa97d0459cb0989ac3676c2861816650
Reviewed-by: Sami Shalayel &lt;sami.shalayel@qt.io&gt;
diff --git a/src/quick3d/qquick3drepeater.cpp b/src/quick3d/qquick3drepeater.cpp
@@ -94,7 +94,13 @@ void QQuick3DRepeater::connectModel(QQmlDelegateModelPointer *model)
         QObject::connect(
                 dataModel, &QQmlDelegateModel::delegateChanged,
                 this, &QQuick3DRepeater::applyDelegateChange);
+        if (m_ownModel) {
+            QObject::connect(
+                    dataModel, &QQmlDelegateModel::modelChanged,
+                    this, &QQuick3DRepeater::modelChanged);
+        }
     }
+
     regenerate();
 }
 
@@ -114,6 +120,11 @@ void QQuick3DRepeater::disconnectModel(QQmlDelegateModelPointer *model)
         QObject::disconnect(
                 delegateModel, &QQmlDelegateModel::delegateChanged,
                 this, &QQuick3DRepeater::applyDelegateChange);
+        if (m_ownModel) {
+            QObject::disconnect(
+                    delegateModel, &QQmlDelegateModel::modelChanged,
+                    this, &QQuick3DRepeater::modelChanged);
+        }
     }
 }
 
diff --git a/tests/auto/quick3d/qquick3drepeater/tst_qquick3drepeater.cpp b/tests/auto/quick3d/qquick3drepeater/tst_qquick3drepeater.cpp
@@ -4,6 +4,8 @@
 #include <QtQml/qqmlengine.h>
 #include <QtQml/qqmlcomponent.h>
 
+#include <QtTest/qsignalspy.h>
+
 #include <QtQmlModels/private/qqmldelegatemodel_p.h>
 #include <QtQuick3D/private/qquick3drepeater_p.h>
 
@@ -126,6 +128,8 @@ void tst_qquick3drepeater::delegateModelAccess()
     QQuick3DRepeater *repeater = qvariant_cast<QQuick3DRepeater *>(object->property("repeater"));
     QVERIFY(repeater);
 
+    QSignalSpy modelChangedSpy(repeater, &QQuick3DRepeater::modelChanged);
+
     if (delegateKind == Delegate::Untyped && modelKind == Model::Array)
         QSKIP("Properties of objects in arrays are not exposed as context properties");
 
@@ -150,20 +154,34 @@ void tst_qquick3drepeater::delegateModelAccess()
             ? access != QQmlDelegateModel::ReadOnly
             : access == QQmlDelegateModel::ReadWrite;
 
+    // Only the array is actually updated itself. The other models are pointers
+    const bool writeShouldSignal = modelKind == Model::Kind::Array;
+
     double expected = 11;
 
+    // Initial setting of the model, signals one update
+    int expectedModelUpdates = 1;
+    QCOMPARE(modelChangedSpy.count(), expectedModelUpdates);
+
     QCOMPARE(delegate->property("immediateX").toDouble(), expected);
     QCOMPARE(delegate->property("modelX").toDouble(), expected);
 
-    if (modelWritable)
+    if (modelWritable) {
         expected = 3;
+        if (writeShouldSignal)
+            ++expectedModelUpdates;
+    }
 
     QMetaObject::invokeMethod(delegate, "writeThroughModel");
     QCOMPARE(delegate->property("immediateX").toDouble(), expected);
     QCOMPARE(delegate->property("modelX").toDouble(), expected);
+    QCOMPARE(modelChangedSpy.count(), expectedModelUpdates);
 
-    if (immediateWritable)
+    if (immediateWritable) {
         expected = 1;
+        if (writeShouldSignal)
+            ++expectedModelUpdates;
+    }
 
     QMetaObject::invokeMethod(delegate, "writeImmediate");
 
@@ -172,6 +190,7 @@ void tst_qquick3drepeater::delegateModelAccess()
              delegateKind == Delegate::Untyped ? expected : 1);
 
     QCOMPARE(delegate->property("modelX").toDouble(), expected);
+    QCOMPARE(modelChangedSpy.count(), expectedModelUpdates);
 }
 
 QTEST_MAIN(tst_qquick3drepeater)

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,13 @@ void QQuick3DRepeater::connectModel(QQmlDelegateModelPointer *model)`
`94`	`94`	`QObject::connect(`
`95`	`95`	`dataModel, &QQmlDelegateModel::delegateChanged,`
`96`	`96`	`this, &QQuick3DRepeater::applyDelegateChange);`
	`97`	`+ if (m_ownModel) {`
	`98`	`+ QObject::connect(`
	`99`	`+ dataModel, &QQmlDelegateModel::modelChanged,`
	`100`	`+ this, &QQuick3DRepeater::modelChanged);`
	`101`	`+ }`
`97`	`102`	`}`
	`103`	`+`
`98`	`104`	`regenerate();`
`99`	`105`	`}`
`100`	`106`
`@@ -114,6 +120,11 @@ void QQuick3DRepeater::disconnectModel(QQmlDelegateModelPointer *model)`
`114`	`120`	`QObject::disconnect(`
`115`	`121`	`delegateModel, &QQmlDelegateModel::delegateChanged,`
`116`	`122`	`this, &QQuick3DRepeater::applyDelegateChange);`
	`123`	`+ if (m_ownModel) {`
	`124`	`+ QObject::disconnect(`
	`125`	`+ delegateModel, &QQmlDelegateModel::modelChanged,`
	`126`	`+ this, &QQuick3DRepeater::modelChanged);`
	`127`	`+ }`
`117`	`128`	`}`
`118`	`129`	`}`
`119`	`130`