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

tst_QGraphicsGridLayout: fix memleaks in a few test functions

Browse Source 
Namely task236367_maxSizeHint(), widthForHeight() and
heightForWidthWithSpanning().

These functions allocated a parent-less QGraphicsWidget on the heap,
and didn't delete it, leaking it.

Hold in unique_ptr instead. This is the minimally-invasive fix.

Amends the start of the public history.

Change-Id: I684c374f2dff14ec93cda87f49ae286fe9453cd9
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
This commit is contained in:
Marc Mutz 2025-03-28 10:22:25 +01:00
parent dceff0ace4
commit 0840c4f1ab
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
View File

@ -2940,7 +2940,7 @@ void tst_QGraphicsGridLayout::styleInfoLeak()
void tst_QGraphicsGridLayout::task236367_maxSizeHint() void tst_QGraphicsGridLayout::task236367_maxSizeHint()
{ {
QGraphicsWidget *widget = new QGraphicsWidget; const auto widget = std::make_unique<QGraphicsWidget>();
QGraphicsGridLayout *layout = new QGraphicsGridLayout; QGraphicsGridLayout *layout = new QGraphicsGridLayout;
widget->setLayout(layout); widget->setLayout(layout);
layout->setContentsMargins(0, 0, 0, 0); layout->setContentsMargins(0, 0, 0, 0);
@ -3045,7 +3045,7 @@ void tst_QGraphicsGridLayout::heightForWidth()
void tst_QGraphicsGridLayout::widthForHeight() void tst_QGraphicsGridLayout::widthForHeight()
{ {
QGraphicsWidget *widget = new QGraphicsWidget; const auto widget = std::make_unique<QGraphicsWidget>();
QGraphicsGridLayout *layout = new QGraphicsGridLayout; QGraphicsGridLayout *layout = new QGraphicsGridLayout;
widget->setLayout(layout); widget->setLayout(layout);
layout->setContentsMargins(0, 0, 0, 0); layout->setContentsMargins(0, 0, 0, 0);
@ -3122,7 +3122,7 @@ void tst_QGraphicsGridLayout::widthForHeight()
void tst_QGraphicsGridLayout::heightForWidthWithSpanning() void tst_QGraphicsGridLayout::heightForWidthWithSpanning()
{ {
QGraphicsWidget *widget = new QGraphicsWidget; const auto widget = std::make_unique<QGraphicsWidget>();
QGraphicsGridLayout *layout = new QGraphicsGridLayout; QGraphicsGridLayout *layout = new QGraphicsGridLayout;
widget->setLayout(layout); widget->setLayout(layout);
layout->setContentsMargins(0, 0, 0, 0); layout->setContentsMargins(0, 0, 0, 0);