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

Demote debuggerrunconfigurationaspect

Browse Source 
NOTE: Next patch will be "Move DRCA to Debugger plugin" and is
needed to make this functional.

Change-Id: Ie405a0e4fbdc0fb35ff16d34c725e7aee5153a4a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2013-03-26 17:03:57 +01:00
parent 21da8c641d
commit e474b6ed8f
22 changed files with 84 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,6 +49,7 @@
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/runconfiguration.h>
#include <projectexplorer/target.h>
#include <projectexplorer/taskhub.h>
@@ -144,7 +145,7 @@ public:
DebuggerRunConfigWidget::DebuggerRunConfigWidget(RunConfiguration *runConfiguration)
{
m_aspect = runConfiguration->debuggerAspect();
m_aspect = runConfiguration->extraAspect<ProjectExplorer::DebuggerRunConfigurationAspect>();
m_useCppDebugger = new QCheckBox(tr("Enable C++"), this);
m_useQmlDebugger = new QCheckBox(tr("Enable QML"), this);
@@ -508,7 +509,8 @@ static DebuggerStartParameters localStartParameters(RunConfiguration *runConfigu
}
}
DebuggerRunConfigurationAspect *aspect = runConfiguration->debuggerAspect();
DebuggerRunConfigurationAspect *aspect
= runConfiguration->extraAspect<ProjectExplorer::DebuggerRunConfigurationAspect>();
sp.multiProcess = aspect->useMultiProcess();
if (aspect->useCppDebugger())
@@ -582,7 +584,8 @@ static bool fixupEngineTypes(DebuggerStartParameters &sp, RunConfiguration *rc,
}
if (rc) {
DebuggerRunConfigurationAspect *aspect = rc->debuggerAspect();
DebuggerRunConfigurationAspect *aspect
= rc->extraAspect<ProjectExplorer::DebuggerRunConfigurationAspect>();
if (const Target *target = rc->target())
if (!fillParameters(&sp, target->kit(), errorMessage))
return false;
@@ -634,6 +637,11 @@ DebuggerRunControl *DebuggerRunControlFactory::doCreate
return new DebuggerRunControl(rc, sp);
}
IRunConfigurationAspect *DebuggerRunControlFactory::createRunConfigurationAspect(RunConfiguration *rc)
{
return new DebuggerRunConfigurationAspect(rc);
}
DebuggerRunControl *DebuggerRunControlFactory::createAndScheduleRun
(const DebuggerStartParameters &sp, RunConfiguration *runConfiguration)
{