1 files changed, 50 insertions, 8 deletions

diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp
index 44166e4aa8..6915ab6e89 100644
--- a/src/qml/types/qqmldelegatemodel.cpp
+++ b/src/qml/types/qqmldelegatemodel.cpp
@@ -93,7 +93,7 @@ struct DelegateModelGroupFunction : QV4::FunctionObject
 
     static Heap::DelegateModelGroupFunction *create(QV4::ExecutionContext *scope, uint flag, QV4::ReturnedValue (*code)(QQmlDelegateModelItem *item, uint flag, const QV4::Value &arg))
     {
-        return scope->engine()->memoryManager->allocObject<DelegateModelGroupFunction>(scope, flag, code);
+        return scope->engine()->memoryManager->allocate<DelegateModelGroupFunction>(scope, flag, code);
     }
 
     static ReturnedValue call(const QV4::FunctionObject *that, const Value *thisObject, const Value *argv, int argc)
@@ -487,6 +487,35 @@ void QQmlDelegateModel::setRootIndex(const QVariant &root)
 }
 
 /*!
+    \qmlproperty int QtQml.Models::DelegateModel::rows
+
+    Contains the number of rows in the model. If the model
+    is a list of items, it will be equal to the number of items
+    in the list.
+
+    \since QtQml.Models 2.12
+*/
+int QQmlDelegateModel::rows() const
+{
+    Q_D(const QQmlDelegateModel);
+    return d->m_adaptorModel.rowCount();
+}
+
+/*!
+    \qmlproperty int QtQml.Models::DelegateModel::columns
+
+    Contains the number of columns in the model. If the model
+    is a list of items, it will be equal to \c 1.
+
+    \since QtQml.Models 2.12
+*/
+int QQmlDelegateModel::columns() const
+{
+    Q_D(const QQmlDelegateModel);
+    return d->m_adaptorModel.columnCount();
+}
+
+/*!
     \qmlmethod QModelIndex QtQml.Models::DelegateModel::modelIndex(int index)
 
     QAbstractItemModel provides a hierarchical tree of data, whereas
@@ -1045,7 +1074,10 @@ QQmlIncubator::Status QQmlDelegateModel::incubationStatus(int index)
     if (!it->inCache())
         return QQmlIncubator::Null;
 
-    return d->m_cache.at(it.cacheIndex)->incubationTask->status();
+    if (auto incubationTask = d->m_cache.at(it.cacheIndex)->incubationTask)
+        return incubationTask->status();
+
+    return QQmlIncubator::Ready;
 }
 
 QString QQmlDelegateModelPrivate::stringValue(Compositor::Group group, int index, const QString &name)
@@ -1587,8 +1619,15 @@ void QQmlDelegateModel::_q_rowsMoved(
 void QQmlDelegateModel::_q_dataChanged(const QModelIndex &begin, const QModelIndex &end, const QVector<int> &roles)
 {
     Q_D(QQmlDelegateModel);
-    if (begin.parent() == d->m_adaptorModel.rootIndex)
-        _q_itemsChanged(begin.row(), end.row() - begin.row() + 1, roles);
+    if (begin.parent() != d->m_adaptorModel.rootIndex)
+        return;
+
+    int rowCount = end.row() - begin.row() + 1;
+
+    for (int col = begin.column(); col <= end.column(); ++col) {
+        int startIndex = d->m_adaptorModel.indexAt(begin.row(), col);
+        _q_itemsChanged(startIndex, rowCount, roles);
+    }
 }
 
 bool QQmlDelegateModel::isDescendantOf(const QPersistentModelIndex& desc, const QList< QPersistentModelIndex >& parents) const
@@ -2482,7 +2521,7 @@ QQmlV4Handle QQmlDelegateModelGroup::get(int index)
         model->m_cacheMetaType->initializePrototype();
     QV4::ExecutionEngine *v4 = model->m_cacheMetaType->v4Engine;
     QV4::Scope scope(v4);
-    QV4::ScopedObject o(scope, v4->memoryManager->allocObject<QQmlDelegateModelItemObject>(cacheItem));
+    QV4::ScopedObject o(scope, v4->memoryManager->allocate<QQmlDelegateModelItemObject>(cacheItem));
     QV4::ScopedObject p(scope, model->m_cacheMetaType->modelItemProto.value());
     o->setPrototype(p);
     ++cacheItem->scriptRef;
@@ -3193,7 +3232,10 @@ QQmlIncubator::Status QQmlPartsModel::incubationStatus(int index)
     if (!it->inCache())
         return QQmlIncubator::Null;
 
-    return model->m_cache.at(it.cacheIndex)->incubationTask->status();
+    if (auto incubationTask = model->m_cache.at(it.cacheIndex)->incubationTask)
+        return incubationTask->status();
+
+    return QQmlIncubator::Ready;
 }
 
 int QQmlPartsModel::indexOf(QObject *item, QObject *) const
@@ -3237,7 +3279,7 @@ struct QQmlDelegateModelGroupChange : QV4::Object
     V4_OBJECT2(QQmlDelegateModelGroupChange, QV4::Object)
 
     static QV4::Heap::QQmlDelegateModelGroupChange *create(QV4::ExecutionEngine *e) {
-        return e->memoryManager->allocObject<QQmlDelegateModelGroupChange>();
+        return e->memoryManager->allocate<QQmlDelegateModelGroupChange>();
     }
 
     static QV4::ReturnedValue method_get_index(const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *, int) {
@@ -3274,7 +3316,7 @@ struct QQmlDelegateModelGroupChangeArray : public QV4::Object
 public:
     static QV4::Heap::QQmlDelegateModelGroupChangeArray *create(QV4::ExecutionEngine *engine, const QVector<QQmlChangeSet::Change> &changes)
     {
-        return engine->memoryManager->allocObject<QQmlDelegateModelGroupChangeArray>(changes);
+        return engine->memoryManager->allocate<QQmlDelegateModelGroupChangeArray>(changes);
     }
 
     quint32 count() const { return d()->changes->count(); }