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

Change-Id: Ib45654e3e79087da4754377f0d78b70c44ed4695

1 files changed, 17 insertions, 3 deletions

diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp
index 0e7b0c1b14..405242767f 100644
--- a/src/qml/types/qqmldelegatemodel.cpp
+++ b/src/qml/types/qqmldelegatemodel.cpp
@@ -1316,9 +1316,23 @@ void QQmlDelegateModelPrivate::itemsRemoved(
                     }
                 } else {
                     if (QQDMIncubationTask *incubationTask = cacheItem->incubationTask) {
-                        for (int i = 1; i < m_groupCount; ++i) {
-                            if (remove.inGroup(i))
-                                incubationTask->index[i] = remove.index[i];
+                        if (!cacheItem->isObjectReferenced()) {
+                            releaseIncubator(cacheItem->incubationTask);
+                            cacheItem->incubationTask = 0;
+                            if (cacheItem->object) {
+                                QObject *object = cacheItem->object;
+                                cacheItem->destroyObject();
+                                if (QQuickPackage *package = qmlobject_cast<QQuickPackage *>(object))
+                                    emitDestroyingPackage(package);
+                                else
+                                    emitDestroyingItem(object);
+                            }
+                            cacheItem->scriptRef -= 1;
+                        } else {
+                            for (int i = 1; i < m_groupCount; ++i) {
+                                if (remove.inGroup(i))
+                                    incubationTask->index[i] = remove.index[i];
+                            }
                         }
                     }
                     if (QQmlDelegateModelAttached *attached = cacheItem->attached) {