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

Merge remote-tracking branch 'origin/2.5'

Browse Source 
Conflicts:
	src/libs/symbianutils/symbianutils.qbs
	src/libs/utils/utils.qbs
	src/libs/zeroconf/zeroconf.qbs

Change-Id: I4c888d8e58ec68dc4638b041b0c6ee743b809ab4
This commit is contained in:
Eike Ziller
2012-03-29 17:58:34 +02:00
parent 2a74097b54 c9bd695a90
commit 63244127a8
19 changed files with 98 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/stackwindow.cpp
View File

@@ -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"));