diff options
3 files changed, 49 insertions, 1 deletions
diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp index 2d296a0e59..223c34a517 100644 --- a/src/gui/itemmodels/qstandarditemmodel.cpp +++ b/src/gui/itemmodels/qstandarditemmodel.cpp @@ -139,6 +139,11 @@ void QStandardItemPrivate::setChild(int row, int column, QStandardItem *item, QStandardItem *oldItem = children.at(index); if (item == oldItem) return; + + if (model && emitChanged) { + emit model->layoutAboutToBeChanged(); + } + if (item) { if (item->d_func()->parent == 0) { item->d_func()->setParentAndModel(q, model); @@ -152,6 +157,10 @@ void QStandardItemPrivate::setChild(int row, int column, QStandardItem *item, oldItem->d_func()->setModel(0); delete oldItem; children.replace(index, item); + + if (model && emitChanged) + emit model->layoutChanged(); + if (emitChanged && model) model->d_func()->itemChanged(item); } diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp index 444d26ce33..7f141bdab0 100644 --- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp @@ -2496,7 +2496,7 @@ void tst_QSortFilterProxyModel::staticSorting() } //update one item. - model.setItem(0, 0, new QStandardItem("girafe")); + items.first()->setData("girafe", Qt::DisplayRole); // make sure the proxy is updated but not sorted expected.replaceInStrings("bateau", "girafe"); diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp index bbb51aed5e..84acac5a96 100644 --- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp @@ -240,6 +240,7 @@ private slots: void taskQTBUG_11466_keyboardNavigationRegression(); void taskQTBUG_13567_removeLastItemRegression(); void taskQTBUG_25333_adjustViewOptionsForIndex(); + void taskQTBUG_18539_emitLayoutChanged(); }; class QtTestModel: public QAbstractItemModel @@ -4054,6 +4055,44 @@ void tst_QTreeView::taskQTBUG_25333_adjustViewOptionsForIndex() } +void tst_QTreeView::taskQTBUG_18539_emitLayoutChanged() +{ + QTreeView view; + + QStandardItem* item = new QStandardItem("Orig"); + QStandardItem* child = new QStandardItem("Child"); + item->setChild(0, 0, child); + + QStandardItemModel model; + model.appendRow(item); + + view.setModel(&model); + + QStandardItem* replacementItem = new QStandardItem("Replacement"); + QStandardItem* replacementChild = new QStandardItem("ReplacementChild"); + + replacementItem->setChild(0, 0, replacementChild); + + QSignalSpy beforeSpy(&model, SIGNAL(layoutAboutToBeChanged())); + QSignalSpy afterSpy(&model, SIGNAL(layoutChanged())); + + QSignalSpy beforeRISpy(&model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int))); + QSignalSpy afterRISpy(&model, SIGNAL(rowsInserted(QModelIndex,int,int))); + + QSignalSpy beforeRRSpy(&model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int))); + QSignalSpy afterRRSpy(&model, SIGNAL(rowsRemoved(QModelIndex,int,int))); + + model.setItem(0, 0, replacementItem); + + QCOMPARE(beforeSpy.size(), 1); + QCOMPARE(afterSpy.size(), 1); + + QCOMPARE(beforeRISpy.size(), 0); + QCOMPARE(afterRISpy.size(), 0); + + QCOMPARE(beforeRISpy.size(), 0); + QCOMPARE(afterRISpy.size(), 0); +} QTEST_MAIN(tst_QTreeView) #include "tst_qtreeview.moc" |