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

debugger: tie engine creation close to runconfiguration creation

Browse Source 
We'd like to be able to restart a debugger engine at some point of time.
This commit is contained in:
hjk
2010-07-20 16:34:39 +02:00
parent 38e2ba8cfe
commit 80f52cce28
2 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/debugger/debuggerrunner.cpp
View File

@@ -174,9 +174,8 @@ RunControl *DebuggerRunControlFactory::create
DebuggerRunControl *DebuggerRunControlFactory::create(const DebuggerStartParameters &sp,
RunConfiguration *runConfiguration)
{
DebuggerRunControl *runControl = new DebuggerRunControl(runConfiguration);
runControl->setEnabledEngines(m_enabledEngines);
runControl->createEngine(sp);
DebuggerRunControl *runControl =
new DebuggerRunControl(runConfiguration, m_enabledEngines, sp);
if (!runControl->engine()) {
qDebug() << "FAILED TO CREATE ENGINE";
delete runControl;
@@ -187,7 +186,8 @@ DebuggerRunControl *DebuggerRunControlFactory::create(const DebuggerStartParamet
return runControl;
}
QWidget *DebuggerRunControlFactory::createConfigurationWidget(RunConfiguration *runConfiguration)
QWidget *DebuggerRunControlFactory::createConfigurationWidget
(RunConfiguration *runConfiguration)
{
// NBS TODO: Add GDB-specific configuration widget
Q_UNUSED(runConfiguration)
@@ -201,12 +201,14 @@ QWidget *DebuggerRunControlFactory::createConfigurationWidget(RunConfiguration *
//
////////////////////////////////////////////////////////////////////////
DebuggerRunControl::DebuggerRunControl(RunConfiguration *runConfiguration)
DebuggerRunControl::DebuggerRunControl(RunConfiguration *runConfiguration,
DebuggerEngineType enabledEngines, const DebuggerStartParameters &sp)
: RunControl(runConfiguration, ProjectExplorer::Constants::DEBUGMODE)
{
m_running = false;
m_enabledEngines = enabledEngines;
m_engine = 0;
m_enabledEngines = AllEngineTypes;
createEngine(sp);
}
DebuggerRunControl::~DebuggerRunControl()
@@ -316,15 +318,9 @@ DebuggerEngineType DebuggerRunControl::engineForMode(DebuggerStartMode startMode
#endif
}
void DebuggerRunControl::setEnabledEngines(DebuggerEngineType enabledEngines)
{
m_enabledEngines = enabledEngines;
}
void DebuggerRunControl::createEngine(const DebuggerStartParameters &sp)
{
// Figure out engine according to toolchain, executable, attach or default.
DebuggerEngineType engineType = NoEngineType;
QString errorMessage;
QString settingsIdHint;