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

Merge remote-tracking branch 'origin/3.5'

Browse Source 
Change-Id: I65968dd02ea6bdd15f304ae567dd0c02238e6949
This commit is contained in:
Eike Ziller
2015-08-20 13:23:06 +02:00
parent 2f781ac280 0173c63853
commit 8eaaef96aa
51 changed files with 341 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/debugger/watchwindow.cpp
View File

@@ -751,6 +751,8 @@ void WatchTreeView::contextMenuEvent(QContextMenuEvent *ev)
QMenu formatMenu(tr("Change Value Display Format"));
if (mi0.isValid())
fillFormatMenu(&formatMenu, mi0);
else
formatMenu.setEnabled(false);
QMenu memoryMenu(tr("Open Memory Editor"));
QAction actOpenMemoryEditAtObjectAddress(0);
@@ -809,6 +811,9 @@ void WatchTreeView::contextMenuEvent(QContextMenuEvent *ev)
breakpointMenu.addAction(&actSetWatchpointAtObjectAddress);
breakpointMenu.addAction(&actSetWatchpointAtPointerAddress);
breakpointMenu.addAction(&actSetWatchpointAtExpression);
breakpointMenu.setEnabled(actSetWatchpointAtObjectAddress.isEnabled()
|| actSetWatchpointAtPointerAddress.isEnabled()
|| actSetWatchpointAtExpression.isEnabled());
QAction actCopy(tr("Copy View Contents to Clipboard"), 0);
QAction actCopyValue(tr("Copy Value to Clipboard"), 0);