forked from qt-creator/qt-creator
ProjectExplorer: Let the ProcessStep figure out relative paths
The WorkingDir may contain macros that still need to be expanded so we need to tell it what we wan't as parent path. Change-Id: I7af8115196b70b5a02217d5709bf0a0cc532ce69 Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
@@ -464,9 +464,7 @@ public:
|
|||||||
FilePath wd = FilePath::fromUserInput(bs["workingDirectory"].toString());
|
FilePath wd = FilePath::fromUserInput(bs["workingDirectory"].toString());
|
||||||
if (wd.isEmpty())
|
if (wd.isEmpty())
|
||||||
wd = "%{ActiveProject:BuildConfig:Path}";
|
wd = "%{ActiveProject:BuildConfig:Path}";
|
||||||
else if (wd.isRelativePath())
|
step->setWorkingDirectory(wd, project()->projectDirectory());
|
||||||
wd = project()->projectDirectory().resolvePath(wd);
|
|
||||||
step->setWorkingDirectory(wd);
|
|
||||||
steps->appendStep(step);
|
steps->appendStep(step);
|
||||||
}
|
}
|
||||||
initializeExtraInfo(extraInfos);
|
initializeExtraInfo(extraInfos);
|
||||||
|
Reference in New Issue
Block a user