From 108dbb4dd3837988515fcbc101af661691cbd51c Mon Sep 17 00:00:00 2001
From: BogDan Vatra <bogdan@kde.org>
Date: Thu, 17 Apr 2025 17:51:01 +0300
Subject: [PATCH] Fix gdbserver connecttion

Remove extra `:` character from empty scheme.
Is needed to fix gdb target remote string from `tcp::<ip>:<port>` to
`tcp:<ip>:<port>`.

Fix baremetal channelString

Change-Id: I169a93599419ee54c182973c2a1f734390f4a035
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/baremetal/idebugserverprovider.cpp | 7 +++----
 src/plugins/debugger/gdb/gdbengine.cpp         | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/plugins/baremetal/idebugserverprovider.cpp b/src/plugins/baremetal/idebugserverprovider.cpp
index 8725b5eb316..0f62f1509b6 100644
--- a/src/plugins/baremetal/idebugserverprovider.cpp
+++ b/src/plugins/baremetal/idebugserverprovider.cpp
@@ -73,6 +73,7 @@ void IDebugServerProvider::setChannel(const QUrl &channel)
 
 void IDebugServerProvider::setChannel(const QString &host, int port)
 {
+    m_channel.setScheme("tcp");
     m_channel.setHost(host);
     m_channel.setPort(port);
 }
@@ -84,10 +85,7 @@ QUrl IDebugServerProvider::channel() const
 
 QString IDebugServerProvider::channelString() const
 {
-    // Just return as "host:port" form.
-    if (m_channel.port() <= 0)
-        return m_channel.host();
-    return m_channel.host() + ':' + QString::number(m_channel.port());
+    return m_channel.toString();
 }
 
 QString IDebugServerProvider::id() const
@@ -336,6 +334,7 @@ void HostWidget::setChannel(const QUrl &channel)
 QUrl HostWidget::channel() const
 {
     QUrl url;
+    url.setScheme("tcp");
     url.setHost(m_hostLineEdit->text());
     url.setPort(m_portSpinBox->value());
     return url;
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 3de92cfe079..f2d323c69ba 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -4603,7 +4603,7 @@ static QString extractRemoteChannel(const QUrl &url, const QString &pipe)
 
     QString scheme = url.scheme();
     if (scheme.isEmpty())
-        scheme = "tcp:";
+        scheme = "tcp";
 
     // "Fix" the IPv6 case with host names without '['...']'
     QString host = url.host();