forked from qt-creator/qt-creator
ProjectExplorer: Always return a build folder
The error handling is done elsewhere. Change-Id: Ie5fa937faf6447458117d355f1c6044c2f2d88ac Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -625,16 +625,8 @@ FilePath BuildConfiguration::buildDirectoryFromTemplate(const FilePath &projectD
|
|||||||
|
|
||||||
auto buildDevice = BuildDeviceKitAspect::device(kit);
|
auto buildDevice = BuildDeviceKitAspect::device(kit);
|
||||||
|
|
||||||
if (buildDir.isAbsolutePath()) {
|
if (buildDir.isAbsolutePath())
|
||||||
bool isReachable = buildDevice->ensureReachable(buildDir);
|
|
||||||
if (!isReachable)
|
|
||||||
return {};
|
|
||||||
return buildDevice->rootPath().withNewMappedPath(buildDir);
|
return buildDevice->rootPath().withNewMappedPath(buildDir);
|
||||||
}
|
|
||||||
|
|
||||||
bool isReachable = buildDevice->ensureReachable(projectDir);
|
|
||||||
if (!isReachable)
|
|
||||||
return {};
|
|
||||||
|
|
||||||
const FilePath baseDir = buildDevice->rootPath().withNewMappedPath(projectDir);
|
const FilePath baseDir = buildDevice->rootPath().withNewMappedPath(projectDir);
|
||||||
return baseDir.resolvePath(buildDir);
|
return baseDir.resolvePath(buildDir);
|
||||||
|
Reference in New Issue
Block a user