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

Docker: Fix searching for clangd

Browse Source 
Environment::searchInPath() does not know from which device it came.
Therefore it will take the PATH variable as it is ( without the
device://... prefix ) and search for files on the local device.

Change-Id: Iecddb5ee1beb4ac821a9ac592f6edb1fc0f68b54
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Marcus Tillmanns
2023-02-09 08:20:01 +01:00
parent 5782c7e6f3
commit f06bc4ab5a
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/docker/dockerdevicewidget.cpp
View File

@@ -182,10 +182,13 @@ DockerDeviceWidget::DockerDeviceWidget(const IDevice::Ptr &device)
logView->clear(); logView->clear();
dockerDevice->updateContainerAccess(); dockerDevice->updateContainerAccess();
const FilePath clangdPath = dockerDevice->systemEnvironment() const FilePath clangdPath = dockerDevice->filePath("clangd")
.searchInPath("clangd", {}, [](const FilePath &clangd) { .searchInPath({},
return Utils::checkClangdVersion(clangd); FilePath::AppendToPath,
}); [](const FilePath &clangd) {
return Utils::checkClangdVersion(clangd);
});
if (!clangdPath.isEmpty()) if (!clangdPath.isEmpty())
m_clangdExecutable->setFilePath(clangdPath); m_clangdExecutable->setFilePath(clangdPath);