From 29bd1b025a3890a21737221b63b3d05b97e1f06c Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 28 Jun 2022 13:37:57 +0200
Subject: [PATCH] RemoteLinux: Translate manually provided gdbserver paths

Similar issue as the one in the referenced task.

Change-Id: I71d7c50d2e6192ec7d8dca0294e087f7c8d6361a
Task-number: QTCREATORBUG-27752
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 .../remotelinux/genericlinuxdeviceconfigurationwidget.cpp    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
index ef5fcba0fd6..7c5d09faddb 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
@@ -130,7 +130,7 @@ void GenericLinuxDeviceConfigurationWidget::keyFileEditingFinished()
 
 void GenericLinuxDeviceConfigurationWidget::gdbServerEditingFinished()
 {
-    device()->setDebugServerPath(FilePath::fromString(m_ui->gdbServerLineEdit->text()));
+    device()->setDebugServerPath(device()->filePath(m_ui->gdbServerLineEdit->text()));
 }
 
 void GenericLinuxDeviceConfigurationWidget::handleFreePortsChanged()
@@ -213,6 +213,7 @@ void GenericLinuxDeviceConfigurationWidget::initGui()
     m_ui->timeoutSpinBox->setValue(sshParams.timeout);
     m_ui->userLineEdit->setText(sshParams.userName());
     m_ui->keyFileLineEdit->setFilePath(sshParams.privateKeyFile);
-    m_ui->gdbServerLineEdit->setText(device()->debugServerPath().toString());
+    // FIXME: Use a remote executable line edit
+    m_ui->gdbServerLineEdit->setText(device()->debugServerPath().path());
     updatePortsWarningLabel();
 }