aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/valgrind/valgrindengine.cpp
diff options
context:
space:
mode:
authorhjk <hjk@theqtcompany.com>2016-01-27 14:42:45 +0100
committerhjk <hjk@theqtcompany.com>2016-01-28 10:04:42 +0000
commita2732a347d504e43f8371ea4751d9830809d6f91 (patch)
treeb4438f47252185274550c9ccc213ef16b31eb19c /src/plugins/valgrind/valgrindengine.cpp
parent76ef8e3c75a16c997a506f94d5ffc7aa360ef0db (diff)
Analyzer: Remove explicit environment and runMode
Instead, use the one in its (Standard)Runnable. Change-Id: I14dbe91c50d083d11e18d514ec391875c64e3851 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Diffstat (limited to 'src/plugins/valgrind/valgrindengine.cpp')
-rw-r--r--src/plugins/valgrind/valgrindengine.cpp18
1 files changed, 1 insertions, 17 deletions
diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp
index 3b7fd77202..cfdd812e9a 100644
--- a/src/plugins/valgrind/valgrindengine.cpp
+++ b/src/plugins/valgrind/valgrindengine.cpp
@@ -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());