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

Merge remote-tracking branch 'origin/2.2'

Browse Source 
Conflicts:
	src/plugins/debugger/breakhandler.cpp
	src/plugins/debugger/cdb/cdbengine.cpp
This commit is contained in:
Oswald Buddenhagen
2011-05-16 17:32:23 +02:00
parent fcaa6b0d1b 5ded3e2f62
commit fa0127bedd
7 changed files with 9207 additions and 1155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -761,8 +761,12 @@ bool CdbEngine::launchCDB(const DebuggerStartParameters &sp, QString *errorMessa
case AttachExternal:
case AttachCrashedExternal:
arguments << QLatin1String("-p") << QString::number(sp.attachPID);
if (sp.startMode == AttachCrashedExternal)
if (sp.startMode == AttachCrashedExternal) {
arguments << QLatin1String("-e") << sp.crashParameter << QLatin1String("-g");
} else {
if (isCreatorConsole(startParameters(), *m_options))
arguments << QLatin1String("-pr") << QLatin1String("-pb");
}
break;
default:
*errorMessage = QString::fromLatin1("Internal error: Unsupported start mode %1.").arg(sp.startMode);
@@ -838,9 +842,6 @@ void CdbEngine::runEngine()
{
if (debug)
qDebug("runEngine");
// Resume the threads frozen by the console stub.
if (isCreatorConsole(startParameters(), *m_options))
postCommand("~* m", 0);
foreach (const QString &breakEvent, m_options->breakEvents)
postCommand(QByteArray("sxe ") + breakEvent.toAscii(), 0);
postCommand("g", 0);