From f06bc4ab5ad5669b26ce4cbe42a4c75a15747c52 Mon Sep 17 00:00:00 2001
From: Marcus Tillmanns <marcus.tillmanns@qt.io>
Date: Thu, 9 Feb 2023 08:20:01 +0100
Subject: [PATCH] Docker: Fix searching for clangd

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>
---
 src/plugins/docker/dockerdevicewidget.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/plugins/docker/dockerdevicewidget.cpp b/src/plugins/docker/dockerdevicewidget.cpp
index b69e9232836..bc9c76f5b25 100644
--- a/src/plugins/docker/dockerdevicewidget.cpp
+++ b/src/plugins/docker/dockerdevicewidget.cpp
@@ -182,10 +182,13 @@ DockerDeviceWidget::DockerDeviceWidget(const IDevice::Ptr &device)
         logView->clear();
         dockerDevice->updateContainerAccess();
 
-        const FilePath clangdPath = dockerDevice->systemEnvironment()
-                                        .searchInPath("clangd", {}, [](const FilePath &clangd) {
-                                            return Utils::checkClangdVersion(clangd);
-                                        });
+        const FilePath clangdPath = dockerDevice->filePath("clangd")
+                                        .searchInPath({},
+                                                      FilePath::AppendToPath,
+                                                      [](const FilePath &clangd) {
+                                                          return Utils::checkClangdVersion(clangd);
+                                                      });
+
         if (!clangdPath.isEmpty())
             m_clangdExecutable->setFilePath(clangdPath);