Handle environment variables when starting an application

 * Handle environment variables in workdir, executable name as
   well as arguments when starting an application
 * Cover both debugger and normal application starts

1 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 41d69fad6e..a239d3ac28 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -147,10 +147,10 @@ static DebuggerStartParameters localStartParameters(RunConfiguration *runConfigu
     QTC_ASSERT(rc, return sp);
 
     sp.startMode = StartInternal;
-    sp.executable = rc->executable();
     sp.environment = rc->environment().toStringList();
-    sp.workingDirectory = rc->workingDirectory();
-    sp.processArgs = rc->commandLineArguments();
+    sp.workingDirectory = rc->environment().expandVariables(rc->workingDirectory());
+    sp.executable = rc->environment().searchInPath(rc->executable(), QStringList() << sp.workingDirectory);
+    sp.processArgs = rc->environment().expandVariables(rc->commandLineArguments());
     sp.toolChainType = rc->toolChainType();
     sp.useTerminal = rc->runMode() == LocalApplicationRunConfiguration::Console;
     sp.dumperLibrary = rc->dumperLibrary();