2 files changed, 40 insertions, 2 deletions
diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp
index 1d6e2924b1..07e372b1ae 100644
--- a/src/gui/itemmodels/qstandarditemmodel.cpp
+++ b/src/gui/itemmodels/qstandarditemmodel.cpp
@@ -148,8 +148,14 @@ void QStandardItemPrivate::setChild(int row, int column, QStandardItem *item,
     if (model && emitChanged)
         emit model->layoutChanged();
 
-    if (emitChanged && model)
-        model->d_func()->itemChanged(item);
+    if (emitChanged && model) {
+        if (item) {
+            model->d_func()->itemChanged(item);
+        } else {
+            const QModelIndex idx = model->index(row, column, q->index());
+            emit model->dataChanged(idx, idx);
+        }
+    }
 }
 
 
@@ -174,7 +180,9 @@ void QStandardItemPrivate::childDeleted(QStandardItem *child)
 {
     int index = childIndex(child);
     Q_ASSERT(index != -1);
+    const auto modelIndex = child->index();
     children.replace(index, 0);
+    emit model->dataChanged(modelIndex, modelIndex);
 }
 
 /*!
@@ -476,6 +484,7 @@ bool QStandardItemPrivate::insertColumns(int column, int count, const QList<QSta
 void QStandardItemModelPrivate::itemChanged(QStandardItem *item)
 {
     Q_Q(QStandardItemModel);
+    Q_ASSERT(item);
     if (item->d_func()->parent == 0) {
         // Header item
         int idx = columnHeaderItems.indexOf(item);
@@ -1721,6 +1730,8 @@ bool QStandardItem::hasChildren() const
     item) takes ownership of \a item. If necessary, the row count and column
     count are increased to fit the item.
 
+    \note Passing a null pointer as \a item removes the item.
+
     \sa child()
 */
 void QStandardItem::setChild(int row, int column, QStandardItem *item)
diff --git a/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp b/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
index cff26be7bb..2f5537adfe 100644
--- a/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
+++ b/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
@@ -117,6 +117,9 @@ private slots:
     void useCase2();
     void useCase3();
 
+    void setNullChild();
+    void deleteChild();
+
     void rootItemFlags();
 #ifdef QT_BUILD_INTERNAL
     void treeDragAndDrop();
@@ -1364,6 +1367,30 @@ void tst_QStandardItemModel::useCase3()
     delete childItem;
 }
 
+void tst_QStandardItemModel::setNullChild()
+{
+    QStandardItemModel model;
+    model.setColumnCount(2);
+    createChildren(&model, model.invisibleRootItem(), 0);
+    QStandardItem *item = model.item(0);
+    QSignalSpy spy(&model, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)));
+    item->setChild(0, nullptr);
+    QCOMPARE(item->child(0), nullptr);
+    QCOMPARE(spy.count(), 1);
+}
+
+void tst_QStandardItemModel::deleteChild()
+{
+    QStandardItemModel model;
+    model.setColumnCount(2);
+    createChildren(&model, model.invisibleRootItem(), 0);
+    QStandardItem *item = model.item(0);
+    QSignalSpy spy(&model, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)));
+    delete item->child(0);
+    QCOMPARE(item->child(0), nullptr);
+    QCOMPARE(spy.count(), 1);
+}
+
 void tst_QStandardItemModel::rootItemFlags()
 {
     QStandardItemModel model(6, 4);