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

Debugger: Make DebuggerRunTool publicly accessible

Browse Source 
That's a temporary move to be able to port the per-target
Debug*Support classes one by one.

Change-Id: I3cf5f9ea367a68058add8713ed23f44da080a175
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-04-21 10:10:25 +02:00
parent dfb825e2a7
commit d87afd4b89
3 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -293,11 +293,10 @@ DebuggerEngine *createEngine(DebuggerEngineType et, const DebuggerRunParameters
return engine;
}
bool DebuggerRunTool::fixup()
static bool fixupParameters(DebuggerRunParameters &rp, RunControl *runControl, QStringList &m_errors)
{
DebuggerRunParameters &rp = m_rp;
RunConfiguration *const runConfig = runControl()->runConfiguration();
Core::Id runMode = runControl()->runMode();
RunConfiguration *runConfig = runControl->runConfiguration();
Core::Id runMode = runControl->runMode();
const Kit *kit = runConfig->target()->kit();
QTC_ASSERT(kit, return false);
@@ -494,6 +493,8 @@ bool DebuggerRunTool::fixup()
return true;
}
} // Internal
////////////////////////////////////////////////////////////////////////
//
// DebuggerRunControlFactory
@@ -508,14 +509,20 @@ static bool isDebuggableScript(RunConfiguration *runConfig)
/// DebuggerRunTool
DebuggerRunTool::DebuggerRunTool(RunControl *runControl, const DebuggerStartParameters &sp, QString *errorMessage)
: DebuggerRunTool(runControl, DebuggerRunParameters(sp), errorMessage)
{}
DebuggerRunTool::DebuggerRunTool(RunControl *runControl, const DebuggerRunParameters &rp, QString *errorMessage)
: ToolRunner(runControl), m_rp(rp)
: ToolRunner(runControl)
{
DebuggerRunParameters m_rp = rp;
runControl->setDisplayName(m_rp.displayName);
// QML and/or mixed are not prepared for it.
runControl->setSupportsReRunning(!(m_rp.languages & QmlLanguage));
if (fixup()) {
if (Internal::fixupParameters(m_rp, runControl, m_errors)) {
m_engine = createEngine(m_rp.masterEngineType, m_rp, &m_errors);
if (!m_engine) {
QString msg = m_errors.join('\n');
@@ -582,6 +589,8 @@ void DebuggerRunTool::showMessage(const QString &msg, int channel, int timeout)
}
}
namespace Internal {
DebuggerEngine *engine(const DebuggerRunControl *runControl)
{
QTC_ASSERT(runControl, return nullptr);
@@ -694,7 +703,7 @@ DebuggerRunControl *createDebuggerRunControl(const DebuggerStartParameters &sp,
{
QTC_ASSERT(runConfig, return nullptr);
auto runControl = new DebuggerRunControl(runConfig, runMode);
(void) new Internal::DebuggerRunTool(runControl, sp, errorMessage);
(void) new DebuggerRunTool(runControl, sp, errorMessage);
return runControl;
}