From c9a8dc990af16bb11f449368eec77264483bc20f Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 18 Oct 2010 18:36:43 +0200
Subject: [PATCH] expand working directory before looking for a command in it
Reviewed-by: hunger
---
src/plugins/projectexplorer/abstractprocessstep.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp
index 9b0786f7e82..bff79b10d5f 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.cpp
+++ b/src/plugins/projectexplorer/abstractprocessstep.cpp
@@ -355,7 +355,8 @@ void AbstractProcessStep::slotProcessFinished(int, QProcess::ExitStatus)
QString AbstractProcessStep::expandedCommand() const
{
- QString command = m_environment.searchInPath(m_command, QStringList() << workingDirectory());
+ QString command = m_environment.searchInPath(
+ m_command, QStringList() << m_environment.expandVariables(m_workingDirectory));
if (command.isEmpty())
command = m_command;
return command;
--
GitLab