Let PortsGatherer produce full URLs instead of ports only

This is what the consuming code expects in most cases.

Change-Id: I135592039e28b994996186f627215ab1d2f8d6dc
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 5 insertions, 10 deletions

diff --git a/src/plugins/boot2qt/qdbdevicedebugsupport.cpp b/src/plugins/boot2qt/qdbdevicedebugsupport.cpp
index cf2fe493274..7ef38ad8322 100644
--- a/src/plugins/boot2qt/qdbdevicedebugsupport.cpp
+++ b/src/plugins/boot2qt/qdbdevicedebugsupport.cpp
@@ -72,16 +72,15 @@ public:
         addStartDependency(m_portsGatherer);
     }
 
-    Port perfPort() const { return m_portsGatherer->gdbServerPort(); }
+    QUrl perfServer() const { return m_portsGatherer->gdbServer(); }
     QUrl gdbServer() const { return m_portsGatherer->gdbServer(); }
-    Port qmlServerPort() const { return m_portsGatherer->qmlServerPort(); }
     QUrl qmlServer() const { return m_portsGatherer->qmlServer(); }
 
     void start() override
     {
-        const int perfPort = m_portsGatherer->gdbServerPort().number();
-        const int gdbServerPort = m_portsGatherer->gdbServerPort().number();
-        const int qmlServerPort = m_portsGatherer->qmlServerPort().number();
+        const int perfPort = m_portsGatherer->gdbServer().port();
+        const int gdbServerPort = m_portsGatherer->gdbServer().port();
+        const int qmlServerPort = m_portsGatherer->qmlServer().port();
 
         int lowerPort = 0;
         int upperPort = 0;
@@ -212,11 +211,7 @@ QdbDevicePerfProfilerSupport::QdbDevicePerfProfilerSupport(RunControl *runContro
 
 void QdbDevicePerfProfilerSupport::start()
 {
-    QUrl url;
-    url.setScheme(Utils::urlTcpScheme());
-    url.setHost(device()->sshParameters().host());
-    url.setPort(m_profilee->perfPort().number());
-    runControl()->setProperty("PerfConnection", url);
+    runControl()->setProperty("PerfConnection", m_profilee->perfServer());
     reportStarted();
 }