diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-12-18 09:02:56 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-12-18 09:14:14 +0100 |
| commit | e16876df0cd65c40480fcf7f2ae9f16ab66c991c (patch) | |
| tree | b5192e9d13d3ba3326382aa20cb53246fdd58d4c /src/plugins/debugger | |
| parent | ef680f547c2748376e45e5aafbf51daa9be4fbba (diff) | |
| parent | 546d4a3b1a7c0996fa9d730c9b0ccf59bea9d1cb (diff) | |
| download | qt-creator-e16876df0cd65c40480fcf7f2ae9f16ab66c991c.tar.gz | |
Merge remote-tracking branch 'origin/4.11'
Change-Id: Ieb0bb1ebab9a5efb42d15bbeac2cd4c46a6de962
Diffstat (limited to 'src/plugins/debugger')
| -rw-r--r-- | src/plugins/debugger/watchhandler.cpp | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index d7c3e11f99..d2cbacaa2d 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -1695,21 +1695,25 @@ bool WatchModel::contextMenuEvent(const ItemViewEvent &ev) addAction(menu, tr("Expand All Children"), item, - [this, item] { - m_expandedINames.insert(item->iname); - item->forFirstLevelChildren([this](WatchItem *child) { - m_expandedINames.insert(child->iname); - }); - m_engine->updateLocals(); + [this, name = item->iname] { + m_expandedINames.insert(name); + if (auto item = findItem(name)) { + item->forFirstLevelChildren([this](WatchItem *child) { + m_expandedINames.insert(child->iname); + }); + m_engine->updateLocals(); + } }); addAction(menu, tr("Collapse All Children"), item, - [this, item] { - item->forFirstLevelChildren([this](WatchItem *child) { - m_expandedINames.remove(child->iname); - }); - m_engine->updateLocals(); + [this, name = item->iname] { + if (auto item = findItem(name)) { + item->forFirstLevelChildren([this](WatchItem *child) { + m_expandedINames.remove(child->iname); + }); + m_engine->updateLocals(); + } }); addAction(menu, tr("Close Editor Tooltips"), @@ -1722,7 +1726,10 @@ bool WatchModel::contextMenuEvent(const ItemViewEvent &ev) addAction(menu, tr("Copy Current Value to Clipboard"), item, - [item] { copyToClipboard(item->value); }); + [this, name = item->iname] { + if (auto item = findItem(name)) + copyToClipboard(item->value); + }); // addAction(menu, tr("Copy Selected Rows to Clipboard"), // selectionModel()->hasSelection(), |