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

Analyzer: Remove explicit environment and runMode

Browse Source 
Instead, use the one in its (Standard)Runnable.

Change-Id: I14dbe91c50d083d11e18d514ec391875c64e3851
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2016-01-27 14:42:45 +01:00
parent 76ef8e3c75
commit a2732a347d
3 changed files with 3 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,6 @@ ValgrindRunControl::ValgrindRunControl(RunConfiguration *runConfiguration, Core:
m_isStopping(false)
{
m_isCustomStart = false;
m_localRunMode = ApplicationLauncher::Gui;
if (runConfiguration)
if (IRunConfigurationAspect *aspect = runConfiguration->extraAspect(ANALYZER_VALGRIND_SETTINGS))
@@ -83,17 +82,12 @@ bool ValgrindRunControl::startEngine()
emit outputReceived(tr("Command line arguments: %1").arg(runnable().debuggeeArgs), DebugFormat);
#endif
StandardRunnable debuggee = runnable();
// FIXME: Consolidate:
debuggee.environment = m_environment;
debuggee.runMode = m_localRunMode;
ValgrindRunner *run = runner();
run->setValgrindExecutable(m_settings->valgrindExecutable());
run->setValgrindArguments(genericToolArguments() + toolArguments());
run->setConnectionParameters(connection().connParams);
run->setUseStartupProject(!m_isCustomStart);
run->setDebuggee(debuggee);
run->setDebuggee(runnable());
connect(run, &ValgrindRunner::processOutputReceived,
this, &ValgrindRunControl::receiveProcessOutput);
@@ -120,16 +114,6 @@ QString ValgrindRunControl::executable() const
return runnable().executable;
}
void ValgrindRunControl::setEnvironment(const Utils::Environment &environment)
{
m_environment = environment;
}
void ValgrindRunControl::setLocalRunMode(ApplicationLauncher::Mode localRunMode)
{
m_localRunMode = localRunMode;
}
QStringList ValgrindRunControl::genericToolArguments() const
{
QTC_ASSERT(m_settings, return QStringList());