diff options
Diffstat (limited to 'src/plugins/debugger/debuggerengine.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggerengine.cpp | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index 35833637a7..9e59a1abf4 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -387,7 +387,11 @@ void DebuggerEnginePrivate::handleContextMenuRequest(const QVariant ¶meters) if (data) { // existing breakpoint const QString number = QString::fromAscii(data->bpNumber); - QAction *act = new QAction(tr("Remove Breakpoint %1").arg(number), menu); + QAction *act; + if (number.isEmpty()) + act = new QAction(tr("Remove Breakpoint"), menu); + else + act = new QAction(tr("Remove Breakpoint %1").arg(number), menu); act->setData(args); connect(act, SIGNAL(triggered()), this, SLOT(breakpointSetRemoveMarginActionTriggered())); @@ -395,14 +399,24 @@ void DebuggerEnginePrivate::handleContextMenuRequest(const QVariant ¶meters) QAction *act2; if (data->enabled) - act2 = new QAction(tr("Disable Breakpoint %1").arg(number), menu); + if (number.isEmpty()) + act2 = new QAction(tr("Disable Breakpoint"), menu); + else + act2 = new QAction(tr("Disable Breakpoint %1").arg(number), menu); else - act2 = new QAction(tr("Enable Breakpoint %1").arg(number), menu); + if (number.isEmpty()) + act2 = new QAction(tr("Enable Breakpoint"), menu); + else + act2 = new QAction(tr("Enable Breakpoint %1").arg(number), menu); act2->setData(args); connect(act2, SIGNAL(triggered()), this, SLOT(breakpointEnableDisableMarginActionTriggered())); menu->addAction(act2); - QAction *editAction = new QAction(tr("Edit Breakpoint %1...").arg(number), menu); + QAction *editAction; + if (number.isEmpty()) + editAction = new QAction(tr("Edit Breakpoint..."), menu); + else + editAction = new QAction(tr("Edit Breakpoint %1...").arg(number), menu); connect(editAction, SIGNAL(triggered()), this, SLOT(slotEditBreakpoint())); editAction->setData(qVariantFromValue(data)); menu->addAction(editAction); @@ -768,7 +782,7 @@ void DebuggerEngine::startDebugger(DebuggerRunControl *runControl) Core::FutureProgress *fp = Core::ICore::instance()->progressManager() ->addTask(d->m_progress.future(), tr("Launching"), _("Debugger.Launcher")); - fp->setKeepOnFinish(false); + fp->setKeepOnFinish(Core::FutureProgress::DontKeepOnFinish); d->m_progress.reportStarted(); } QTC_ASSERT(runControl, notifyEngineSetupFailed(); return); |