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

QStackedLayout: fix a memory leak

Browse Source 
A layout takes ownership of the QLayoutItem passed to addItem.

Change-Id: Iea3c64453f3cbf4f1b5660e505c1a35dca537833
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 1fcc882d7ca564f17e49b8d51adc43eb5b97c57b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Giuseppe D'Angelo 2020-11-22 16:02:50 +01:00 committed by Qt Cherry-pick Bot
parent e2c0cc9bb3
commit c4748f909c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/kernel/qstackedlayout.cpp
View File

@ -44,6 +44,8 @@
#include "private/qwidget_p.h" #include "private/qwidget_p.h"
#include "private/qlayoutengine_p.h" #include "private/qlayoutengine_p.h"
#include <memory>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QStackedLayoutPrivate : public QLayoutPrivate class QStackedLayoutPrivate : public QLayoutPrivate
@ -421,13 +423,13 @@ int QStackedLayout::count() const
*/ */
void QStackedLayout::addItem(QLayoutItem *item) void QStackedLayout::addItem(QLayoutItem *item)
{ {
std::unique_ptr<QLayoutItem> guard(item);
QWidget *widget = item->widget(); QWidget *widget = item->widget();
if (Q_UNLIKELY(!widget)) { if (Q_UNLIKELY(!widget)) {
qWarning("QStackedLayout::addItem: Only widgets can be added"); qWarning("QStackedLayout::addItem: Only widgets can be added");
return; return;
} }
addWidget(widget); addWidget(widget);
delete item;
} }
/*! /*!