1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_qstandarditemmodel: fix memleaks

Browse Source 
QStandardItemModel::takeItem/Row/Column() return items not owned by the
model anymore and therefore need to be cleaned up manually

Fixes: QTBUG-116532
Change-Id: Ic8797f58184f56b9c4ef415ce8f2363c1b352388
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit ab4bb5077cc82bed1f5c297f1753a68ed5fb49f1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Christian Ehrlicher 2023-11-11 17:42:36 +01:00 committed by Qt Cherry-pick Bot
parent 7da3dda667
commit b44828959e
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
View File

@ -1614,15 +1614,21 @@ void tst_QStandardItemModel::removeRowsAndColumns()
QList<QStandardItem *> row_taken = model.takeRow(6); QList<QStandardItem *> row_taken = model.takeRow(6);
QCOMPARE(row_taken.size(), col_list.size()); QCOMPARE(row_taken.size(), col_list.size());
for (int c = 0; c < col_list.size(); c++) for (qsizetype c = 0; c < row_taken.size(); c++) {
QCOMPARE(row_taken[c]->text() , row_list[6] + QLatin1Char('x') + col_list[c]); auto item = row_taken.at(c);
QCOMPARE(item->text() , row_list[6] + QLatin1Char('x') + col_list[c]);
delete item;
}
row_list.remove(6); row_list.remove(6);
VERIFY_MODEL VERIFY_MODEL
QList<QStandardItem *> col_taken = model.takeColumn(10); QList<QStandardItem *> col_taken = model.takeColumn(10);
QCOMPARE(col_taken.size(), row_list.size()); QCOMPARE(col_taken.size(), row_list.size());
for (int r = 0; r < row_list.size(); r++) for (qsizetype r = 0; r < col_taken.size(); r++) {
QCOMPARE(col_taken[r]->text() , row_list[r] + QLatin1Char('x') + col_list[10]); auto item = col_taken.at(r);
QCOMPARE(item->text() , row_list[r] + QLatin1Char('x') + col_list[10]);
delete item;
}
col_list.remove(10); col_list.remove(10);
VERIFY_MODEL VERIFY_MODEL
} }
@ -1792,6 +1798,7 @@ void tst_QStandardItemModel::signalsOnTakeItem() // QTBUG-89145
QCOMPARE(takenItem->model(), nullptr); QCOMPARE(takenItem->model(), nullptr);
QCOMPARE(takenItem->child(0, 0)->model(), nullptr); QCOMPARE(takenItem->child(0, 0)->model(), nullptr);
QCOMPARE(m.index(1, 0).data(), QVariant()); QCOMPARE(m.index(1, 0).data(), QVariant());
delete takenItem;
} }
void tst_QStandardItemModel::createPersistentOnLayoutAboutToBeChanged() // QTBUG-93466 void tst_QStandardItemModel::createPersistentOnLayoutAboutToBeChanged() // QTBUG-93466