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

Analyzer: Split AnalyzerStartParameters

Browse Source 
... into AnalyzerRunnable and AnalyzerConnection and use the
RunControl's storage instead of an own copy in AnalyzerRunControl.

This is an intermediate step on the way to remove
AnalyzerStartParameters.

Change-Id: Iee7c38781b2fd6ef030dcdada1993684cbb34c74
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
hjk
2016-01-18 17:49:29 +01:00
parent 077079cf2a
commit dcba1b3c36
7 changed files with 44 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/valgrind/valgrindengine.cpp
View File

@@ -82,21 +82,20 @@ bool ValgrindRunControl::startEngine()
this, &ValgrindRunControl::handleProgressFinished);
m_progress.reportStarted();
const AnalyzerStartParameters &sp = startParameters();
#if VALGRIND_DEBUG_OUTPUT
emit outputReceived(tr("Valgrind options: %1").arg(toolArguments().join(QLatin1Char(' '))), DebugFormat);
emit outputReceived(tr("Working directory: %1").arg(sp.workingDirectory), DebugFormat);
emit outputReceived(tr("Command line arguments: %1").arg(sp.debuggeeArgs), DebugFormat);
emit outputReceived(tr("Working directory: %1").arg(runnable().workingDirectory), DebugFormat);
emit outputReceived(tr("Command line arguments: %1").arg(runnable().debuggeeArgs), DebugFormat);
#endif
ValgrindRunner *run = runner();
run->setWorkingDirectory(workingDirectory());
run->setValgrindExecutable(m_settings->valgrindExecutable());
run->setValgrindArguments(genericToolArguments() + toolArguments());
run->setDebuggeeExecutable(sp.debuggee);
run->setDebuggeeArguments(sp.debuggeeArgs);
run->setDebuggeeExecutable(runnable().debuggee);
run->setDebuggeeArguments(runnable().debuggeeArgs);
run->setEnvironment(m_environment);
run->setConnectionParameters(sp.connParams);
run->setConnectionParameters(connection().connParams);
run->setUseStartupProject(!m_isCustomStart);
run->setLocalRunMode(m_localRunMode);
@@ -122,7 +121,7 @@ void ValgrindRunControl::stopEngine()
QString ValgrindRunControl::executable() const
{
return startParameters().debuggee;
return runnable().debuggee;
}
void ValgrindRunControl::setEnvironment(const Utils::Environment &environment)