feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Do not leak menus in watch model / debugger

Browse Source 
QMenu::addMenu does not take ownership, and QMenu::popup doesn't delete
the menu either.

Change-Id: Ia11170db6538c1019d06b3fd84bb79b1241b0b9d
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2018-06-14 14:46:28 +02:00
parent 69d7b72837
commit cd7aafef50
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/debugger/watchhandler.cpp
View File

@@ -416,9 +416,9 @@ public:
QString removeNamespaces(QString str) const; QString removeNamespaces(QString str) const;
bool contextMenuEvent(const ItemViewEvent &ev); bool contextMenuEvent(const ItemViewEvent &ev);
QMenu *createFormatMenu(WatchItem *item); QMenu *createFormatMenu(WatchItem *item, QWidget *parent);
QMenu *createMemoryMenu(WatchItem *item); QMenu *createMemoryMenu(WatchItem *item, QWidget *parent);
QMenu *createBreakpointMenu(WatchItem *item); QMenu *createBreakpointMenu(WatchItem *item, QWidget *parent);
void addStackLayoutMemoryView(bool separateView, const QPoint &p); void addStackLayoutMemoryView(bool separateView, const QPoint &p);
@@ -1657,9 +1657,9 @@ bool WatchModel::contextMenuEvent(const ItemViewEvent &ev)
[this] { grabWidget(); }); [this] { grabWidget(); });
menu->addSeparator(); menu->addSeparator();
menu->addMenu(createFormatMenu(item)); menu->addMenu(createFormatMenu(item, menu));
menu->addMenu(createMemoryMenu(item)); menu->addMenu(createMemoryMenu(item, menu));
menu->addMenu(createBreakpointMenu(item)); menu->addMenu(createBreakpointMenu(item, menu));
menu->addSeparator(); menu->addSeparator();
addAction(menu, tr("Expand All Children"), addAction(menu, tr("Expand All Children"),
@@ -1712,13 +1712,14 @@ bool WatchModel::contextMenuEvent(const ItemViewEvent &ev)
menu->addSeparator(); menu->addSeparator();
menu->addAction(action(SettingsDialog)); menu->addAction(action(SettingsDialog));
connect(menu, &QMenu::aboutToHide, menu, &QObject::deleteLater);
menu->popup(ev.globalPos()); menu->popup(ev.globalPos());
return true; return true;
} }
QMenu *WatchModel::createBreakpointMenu(WatchItem *item) QMenu *WatchModel::createBreakpointMenu(WatchItem *item, QWidget *parent)
{ {
auto menu = new QMenu(tr("Add Data Breakpoint")); auto menu = new QMenu(tr("Add Data Breakpoint"), parent);
if (!item) { if (!item) {
menu->setEnabled(false); menu->setEnabled(false);
return menu; return menu;
@@ -1760,9 +1761,9 @@ QMenu *WatchModel::createBreakpointMenu(WatchItem *item)
return menu; return menu;
} }
QMenu *WatchModel::createMemoryMenu(WatchItem *item) QMenu *WatchModel::createMemoryMenu(WatchItem *item, QWidget *parent)
{ {
auto menu = new QMenu(tr("Open Memory Editor")); auto menu = new QMenu(tr("Open Memory Editor"), parent);
if (!item || !m_engine->hasCapability(ShowMemoryCapability)) { if (!item || !m_engine->hasCapability(ShowMemoryCapability)) {
menu->setEnabled(false); menu->setEnabled(false);
return menu; return menu;
@@ -1813,9 +1814,9 @@ QMenu *WatchModel::createMemoryMenu(WatchItem *item)
return menu; return menu;
} }
QMenu *WatchModel::createFormatMenu(WatchItem *item) QMenu *WatchModel::createFormatMenu(WatchItem *item, QWidget *parent)
{ {
auto menu = new QMenu(tr("Change Value Display Format")); auto menu = new QMenu(tr("Change Value Display Format"), parent);
if (!item) { if (!item) {
menu->setEnabled(false); menu->setEnabled(false);
return menu; return menu;