Debugger: Fix Symbian.

...which subclasses DebuggerRunner and does not call
DebuggerPlugin::startDebugger(), which connects the
engine, leading to strange malfunctions. Move functionality
to DebuggerRunner::start() to make it self-contained.
Add object names to engines for easier debugging.

Reviewed-by: hjk
This commit is contained in:
Friedemann Kleint
2010-08-24 15:35:46 +02:00
parent f1dea465ac
commit 54f9654bd3
12 changed files with 46 additions and 37 deletions

View File

@@ -189,7 +189,6 @@ DebuggerRunControl *DebuggerRunControlFactory::create(
delete runControl;
return 0;
}
connect(runControl, SIGNAL(started()), runControl, SLOT(handleStarted()));
connect(runControl, SIGNAL(finished()), runControl, SLOT(handleFinished()));
return runControl;
}
@@ -460,7 +459,6 @@ void DebuggerRunControl::start()
QString errorMessage;
QString settingsCategory;
QString settingsPage;
QString settingsIdHint;
if (!checkDebugConfiguration(sp.toolChainType,
&errorMessage, &settingsCategory, &settingsPage)) {
@@ -471,17 +469,16 @@ void DebuggerRunControl::start()
return;
}
plugin()->activateDebugMode();
plugin()->showMessage(tr("Starting debugger for tool chain '%1'...")
.arg(toolChainName(sp.toolChainType)), StatusBar);
plugin()->activateDebugMode();
const QString message = tr("Starting debugger '%1' for tool chain '%2'...").
arg(m_engine->objectName(), toolChainName(sp.toolChainType));
plugin()->showMessage(message, StatusBar);
plugin()->showMessage(DebuggerSettings::instance()->dump(), LogDebug);
engine()->startDebugger(this);
}
void DebuggerRunControl::startSuccessful()
{
m_running = true;
plugin()->runControlStarted(this);
emit started();
}
@@ -492,11 +489,6 @@ void DebuggerRunControl::startFailed()
engine()->handleStartFailed();
}
void DebuggerRunControl::handleStarted()
{
plugin()->runControlStarted(this);
}
void DebuggerRunControl::handleFinished()
{
engine()->handleFinished();