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>
This commit is contained in:
hjk
2019-08-23 11:13:29 +02:00
parent 89f3b32104
commit dca7edbeef
11 changed files with 35 additions and 60 deletions

View File

@@ -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();
}