Valgrind: Use StandardRunnable in ValgrindRunner and ValgrindProcess

Change-Id: I17def50bbf6887b63d676fdb245064f1df2003de
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>

1 files changed, 8 insertions, 5 deletions

diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp
index dc6ed77edc..aa018d0566 100644
--- a/src/plugins/valgrind/valgrindengine.cpp
+++ b/src/plugins/valgrind/valgrindengine.cpp
@@ -83,16 +83,19 @@ bool ValgrindRunControl::startEngine()
     emit outputReceived(tr("Command line arguments: %1").arg(runnable().debuggeeArgs), DebugFormat);
 #endif
 
+    StandardRunnable debuggee;
+    debuggee.workingDirectory = workingDirectory();
+    debuggee.executable = runnable().debuggee;
+    debuggee.commandLineArguments = runnable().debuggeeArgs;
+    debuggee.environment = m_environment;
+    debuggee.runMode = m_localRunMode;
+
     ValgrindRunner *run = runner();
-    run->setWorkingDirectory(workingDirectory());
     run->setValgrindExecutable(m_settings->valgrindExecutable());
     run->setValgrindArguments(genericToolArguments() + toolArguments());
-    run->setDebuggeeExecutable(runnable().debuggee);
-    run->setDebuggeeArguments(runnable().debuggeeArgs);
-    run->setEnvironment(m_environment);
     run->setConnectionParameters(connection().connParams);
     run->setUseStartupProject(!m_isCustomStart);
-    run->setLocalRunMode(m_localRunMode);
+    run->setDebuggee(debuggee);
 
     connect(run, &ValgrindRunner::processOutputReceived,
             this, &ValgrindRunControl::receiveProcessOutput);