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

Merge remote branch 'origin/2.1'

Browse Source 
Conflicts:
	share/qtcreator/templates/qmlapp/app.pro
	src/libs/utils/filesearch.cpp
This commit is contained in:
Oswald Buddenhagen
2010-10-18 20:59:12 +02:00
parent f3cb1f0bf3 9240ceaf35
commit dfee3388af
108 changed files with 1578 additions and 1006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/debugger/debuggerengine.cpp
View File

@@ -387,7 +387,11 @@ void DebuggerEnginePrivate::handleContextMenuRequest(const QVariant &parameters)
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 &parameters)
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);