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

Docker: Add clangd path to sdktool

Browse Source 
This patch also allows the user/installer to supply a path without
the device root, to make it easier for the installer.

Fixes: QTCREATORBUG-29694
Change-Id: I641b06dd2f4a9d94079fb26f2ed949c5246c1c1e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2023-10-04 10:01:44 +02:00
parent 664be8ed48
commit d79c69918f
3 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/docker/dockerdevice.cpp
View File

@@ -232,13 +232,28 @@ DockerDeviceSettings::DockerDeviceSettings()
&StringSelectionAspect::refill);
clangdExecutable.setValidationFunction(
[](const QString &newValue) -> FancyLineEdit::AsyncValidationFuture {
return asyncRun([newValue]() -> expected_str<QString> {
[this](const QString &newValue) -> FancyLineEdit::AsyncValidationFuture {
const FilePath rootPath = FilePath::fromParts(Constants::DOCKER_DEVICE_SCHEME,
repoAndTagEncoded(),
u"/");
return asyncRun([rootPath, newValue]() -> expected_str<QString> {
QString changedValue = newValue;
FilePath path = FilePath::fromUserInput(newValue);
if (!path.needsDevice()) {
const FilePath onDevicePath = rootPath.withNewMappedPath(path);
if (onDevicePath.exists()) {
changedValue = onDevicePath.toUserOutput();
path = onDevicePath;
} else {
return make_unexpected(
Tr::tr("Path \"%1\" does not exist.").arg(onDevicePath.toUserOutput()));
}
}
QString error;
bool result = checkClangdVersion(FilePath::fromUserInput(newValue), &error);
bool result = checkClangdVersion(path, &error);
if (!result)
return make_unexpected(error);
return newValue;
return changedValue;
});
});
@@ -320,6 +335,8 @@ public:
{
if (deviceSettings->clangdExecutable().isEmpty())
return std::nullopt;
if (!deviceSettings->clangdExecutable().needsDevice())
return deviceSettings->rootPath().withNewMappedPath(deviceSettings->clangdExecutable());
return deviceSettings->clangdExecutable();
}