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

2
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -500,7 +500,7 @@ void CMakeProject::setUserEnvironmentChanges(const QString &buildConfig, const Q
QStringList list = EnvironmentItem::toStringList(diff); QStringList list = EnvironmentItem::toStringList(diff);
if (list == value(buildConfig, "userEnvironmentChanges")) if (list == value(buildConfig, "userEnvironmentChanges"))
return; return;
setValue(buildConfig, "userEnvironmentChanges", EnvironmentItem::toStringList(diff)); setValue(buildConfig, "userEnvironmentChanges", list);
emit environmentChanged(buildConfig); emit environmentChanged(buildConfig);
} }

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 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) void AbstractProcessStep::setWorkingDirectory(const QString &buildConfiguration, const QString &workingDirectory)