diff options
| author | Eike Ziller <[email protected]> | 2012-03-29 17:58:34 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2012-03-29 17:58:34 +0200 |
| commit | 63244127a88010abe98858be8d42c93f1755b537 (patch) | |
| tree | a1f3326ccf2e74853a1b8cf20b4b1a5239be01ee /src/plugins/debugger/stackwindow.cpp | |
| parent | 2a74097b54e27ff21f8c6d2723e76761c31e34d0 (diff) | |
| parent | c9bd695a90350b8741b6491698308949af22b08a (diff) | |
Merge remote-tracking branch 'origin/2.5'
Conflicts:
src/libs/symbianutils/symbianutils.qbs
src/libs/utils/utils.qbs
src/libs/zeroconf/zeroconf.qbs
Change-Id: I4c888d8e58ec68dc4638b041b0c6ee743b809ab4
Diffstat (limited to 'src/plugins/debugger/stackwindow.cpp')
| -rw-r--r-- | src/plugins/debugger/stackwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/debugger/stackwindow.cpp b/src/plugins/debugger/stackwindow.cpp index 94e04b5a57c..cf8a59d6ca1 100644 --- a/src/plugins/debugger/stackwindow.cpp +++ b/src/plugins/debugger/stackwindow.cpp @@ -157,7 +157,7 @@ void StackTreeView::contextMenuEvent(QContextMenuEvent *ev) if (engine->hasCapability(DisassemblerCapability)) { actShowDisassemblerAt = menu.addAction(QString()); - actShowDisassemblerAtAddress = menu.addAction(tr("Open Disassembler at address...")); + actShowDisassemblerAtAddress = menu.addAction(tr("Open Disassembler at Address...")); actShowDisassemblerAtFunction = menu.addAction(tr("Disassemble Function...")); if (address == 0) { actShowDisassemblerAt->setText(tr("Open Disassembler")); |