2 files changed, 60 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlinstantiator/data/activeModelChangeInteraction.qml b/tests/auto/qml/qqmlinstantiator/data/activeModelChangeInteraction.qml
new file mode 100644
index 0000000000..2797566ad2
--- /dev/null
+++ b/tests/auto/qml/qqmlinstantiator/data/activeModelChangeInteraction.qml
@@ -0,0 +1,39 @@
+import QtQuick 2.15
+import QtQml.Models 2.15
+
+Item {
+    id: root
+    property int instanceCount: 0
+    property alias active: instantiator.active
+
+    ListModel {
+        id: listmodel
+
+        dynamicRoles: true
+    }
+
+    Component.onCompleted: {
+        listmodel.insert(listmodel.count, {name: "one"})
+        listmodel.insert(listmodel.count, {name: "two"})
+        listmodel.insert(listmodel.count, {name: "three"})
+    }
+
+    Instantiator {
+        id: instantiator
+
+        active: false
+
+        model: listmodel
+
+        delegate: Text {
+            width: 100
+            height: 20
+
+            text: name
+
+            Component.onCompleted: ++root.instanceCount
+        }
+
+    }
+}
+
diff --git a/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp b/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp
index 84e08c471a..d5587432de 100644
--- a/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp
+++ b/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp
@@ -47,6 +47,7 @@ private slots:
     void createMultiple();
     void stringModel();
     void activeProperty();
+    void activeModelChangeInteraction();
     void intModelChange();
     void createAndRemove();
 
@@ -153,6 +154,26 @@ void tst_qqmlinstantiator::activeProperty()
     QCOMPARE(object->property("idx").toInt(), 0);
 }
 
+void tst_qqmlinstantiator::activeModelChangeInteraction()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFileUrl("activeModelChangeInteraction.qml"));
+    QScopedPointer<QObject> root(component.create());
+    QVERIFY(root);
+
+    // If the instantiator is inactive, a model change does not lead to items being loaded
+    bool ok = false;
+    int count = root->property("instanceCount").toInt(&ok);
+    QVERIFY(ok);
+    QCOMPARE(count, 0);
+
+    // When turning the instantiator active, it will however reflect the model
+    root->setProperty("active", true);
+    count = root->property("instanceCount").toInt(&ok);
+    QVERIFY(ok);
+    QCOMPARE(count, 3);
+}
+
 void tst_qqmlinstantiator::intModelChange()
 {
     QQmlEngine engine;