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

Debugger: Show some text even for disabled context menu action

Browse Source 
Task-number: QTCREATORBUG-12527
Change-Id: I293481f7e54a94de375e2cfc50a32ccaeb28231b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
hjk
2014-06-27 14:54:31 +02:00
parent 095111b2af
commit 90b15b0245
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -754,6 +754,8 @@ void WatchTreeView::contextMenuEvent(QContextMenuEvent *ev)
QAction actSetWatchpointAtObjectAddress(0); QAction actSetWatchpointAtObjectAddress(0);
QAction actSetWatchpointAtPointerAddress(0); QAction actSetWatchpointAtPointerAddress(0);
actSetWatchpointAtPointerAddress.setText(tr("Add Data Breakpoint at Pointer's Address"));
actSetWatchpointAtPointerAddress.setEnabled(false);
const bool canSetWatchpoint = engine->hasCapability(WatchpointByAddressCapability); const bool canSetWatchpoint = engine->hasCapability(WatchpointByAddressCapability);
if (canSetWatchpoint && address) { if (canSetWatchpoint && address) {
actSetWatchpointAtObjectAddress actSetWatchpointAtObjectAddress
@@ -764,9 +766,9 @@ void WatchTreeView::contextMenuEvent(QContextMenuEvent *ev)
actSetWatchpointAtPointerAddress actSetWatchpointAtPointerAddress
.setText(tr("Add Data Breakpoint at Pointer's Address (0x%1)") .setText(tr("Add Data Breakpoint at Pointer's Address (0x%1)")
.arg(pointerAddress, 0, 16)); .arg(pointerAddress, 0, 16));
actSetWatchpointAtPointerAddress.setCheckable(true);
actSetWatchpointAtPointerAddress actSetWatchpointAtPointerAddress
.setChecked(mi0.data(LocalsIsWatchpointAtPointerAddressRole).toBool()); .setChecked(mi0.data(LocalsIsWatchpointAtPointerAddressRole).toBool());
actSetWatchpointAtPointerAddress.setEnabled(true);
} }
} else { } else {
actSetWatchpointAtObjectAddress.setText(tr("Add Data Breakpoint")); actSetWatchpointAtObjectAddress.setText(tr("Add Data Breakpoint"));
@@ -873,7 +875,6 @@ void WatchTreeView::contextMenuEvent(QContextMenuEvent *ev)
QMenu breakpointMenu; QMenu breakpointMenu;
breakpointMenu.setTitle(tr("Add Data Breakpoint...")); breakpointMenu.setTitle(tr("Add Data Breakpoint..."));
breakpointMenu.addAction(&actSetWatchpointAtObjectAddress); breakpointMenu.addAction(&actSetWatchpointAtObjectAddress);
if (canSetWatchpoint && address)
breakpointMenu.addAction(&actSetWatchpointAtPointerAddress); breakpointMenu.addAction(&actSetWatchpointAtPointerAddress);
breakpointMenu.addAction(&actSetWatchpointAtExpression); breakpointMenu.addAction(&actSetWatchpointAtExpression);