From f29b54d8a1a0a71c7cc19795029c872e39f98404 Mon Sep 17 00:00:00 2001
From: Marcus Tillmanns <marcus.tillmanns@qt.io>
Date: Tue, 20 Jun 2023 10:42:07 +0200
Subject: [PATCH] Autotest: Use FilePath::searchInDirectories

FilePath::searchInDirectories handles absolute paths on devices
better unlike Environment::searchInPath() which requires
a QString argument.

Previously the device:// part was dropped when trying to run
remote tests.

Fixes: QTCREATORBUG-29183
Change-Id: Idd04cdb8798d04abf88ab6cb4b68eb73d890a482
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/autotest/testconfiguration.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/plugins/autotest/testconfiguration.cpp b/src/plugins/autotest/testconfiguration.cpp
index c095e9e0f6a..5f225db1972 100644
--- a/src/plugins/autotest/testconfiguration.cpp
+++ b/src/plugins/autotest/testconfiguration.cpp
@@ -57,9 +57,10 @@ FilePath ITestConfiguration::executableFilePath() const
     if (!hasExecutable())
         return {};
 
-    const Environment env = m_runnable.environment.hasChanges()
-            ? m_runnable.environment : Environment::systemEnvironment();
-    return env.searchInPath(m_runnable.command.executable().path());
+    const Environment env = m_runnable.environment.appliedToEnvironment(
+        m_runnable.command.executable().deviceEnvironment());
+
+    return m_runnable.command.executable().searchInDirectories(env.path());
 }
 
 Environment ITestConfiguration::filteredEnvironment(const Environment &original) const