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

Take the build environment into account for searching what to execute.

Browse Source 
Fixes a bug where the cmake plugin wasn't finding make, if the make
commands directory was added to path in the build environment.
This commit is contained in:
dt
2009-09-07 18:58:04 +02:00
parent 61ed06d58e
commit e58ff77bd3
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/abstractprocessstep.cpp
View File

@@ -58,7 +58,13 @@ void AbstractProcessStep::setCommand(const QString &buildConfiguration, const QS
QString AbstractProcessStep::command(const QString &buildConfiguration) const
{
return value(buildConfiguration, PROCESS_COMMAND).toString();
QString result = value(buildConfiguration, PROCESS_COMMAND).toString();
if (QFileInfo(result).isRelative()) {
QString searchInPath = environment(buildConfiguration).searchInPath(result);
if (!searchInPath.isEmpty())
result = searchInPath;
}
return result;
}
void AbstractProcessStep::setWorkingDirectory(const QString &buildConfiguration, const QString &workingDirectory)