diff options
author | hjk <hjk@qt.io> | 2019-08-23 11:13:29 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-08-26 08:16:03 +0000 |
commit | dca7edbeef1ad622e41987b6cf87d1873ad757e6 (patch) | |
tree | 2b21ea3eb246cfcfc6f91b7ce1043334649e1e5c /src/plugins/qnx | |
parent | 89f3b32104e1094bdb6942c52e1ee0eced2f0c3c (diff) | |
download | qt-creator-dca7edbeef1ad622e41987b6cf87d1873ad757e6.tar.gz |
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>
Diffstat (limited to 'src/plugins/qnx')
-rw-r--r-- | src/plugins/qnx/qnxanalyzesupport.cpp | 9 | ||||
-rw-r--r-- | src/plugins/qnx/qnxdebugsupport.cpp | 10 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/plugins/qnx/qnxanalyzesupport.cpp b/src/plugins/qnx/qnxanalyzesupport.cpp index 3f732f8805..cab0bc7d57 100644 --- a/src/plugins/qnx/qnxanalyzesupport.cpp +++ b/src/plugins/qnx/qnxanalyzesupport.cpp @@ -66,17 +66,12 @@ QnxQmlProfilerSupport::QnxQmlProfilerSupport(RunControl *runControl) void QnxQmlProfilerSupport::start() { - Port qmlPort = m_portsGatherer->findPort(); - - QUrl serverUrl; - serverUrl.setHost(device()->sshParameters().host()); - serverUrl.setPort(qmlPort.number()); - serverUrl.setScheme("tcp"); + const QUrl serverUrl = m_portsGatherer->findEndPoint(); m_profiler->recordData("QmlServerUrl", serverUrl); Runnable r = runnable(); QtcProcess::addArg(&r.commandLineArguments, - QmlDebug::qmlDebugTcpArguments(QmlDebug::QmlProfilerServices, qmlPort), + QmlDebug::qmlDebugTcpArguments(QmlDebug::QmlProfilerServices, serverUrl), device()->osType()); setRunnable(r); diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp index ed67dc8a35..37809a9e44 100644 --- a/src/plugins/qnx/qnxdebugsupport.cpp +++ b/src/plugins/qnx/qnxdebugsupport.cpp @@ -108,13 +108,13 @@ private: Runnable r = runnable(); QStringList arguments; if (m_portsGatherer->useGdbServer()) { - Port pdebugPort = m_portsGatherer->gdbServerPort(); + int pdebugPort = m_portsGatherer->gdbServer().port(); r.executable = FilePath::fromString(Constants::QNX_DEBUG_EXECUTABLE); - arguments.append(pdebugPort.toString()); + arguments.append(QString::number(pdebugPort)); } if (m_portsGatherer->useQmlServer()) { arguments.append(QmlDebug::qmlDebugTcpArguments(QmlDebug::QmlDebuggerServices, - m_portsGatherer->qmlServerPort())); + m_portsGatherer->qmlServer())); } arguments.append(QtcProcess::splitArgs(r.commandLineArguments)); r.commandLineArguments = QtcProcess::joinArgs(arguments); @@ -206,11 +206,11 @@ public: private: void start() final { - Port pdebugPort = m_portsGatherer->gdbServerPort(); + const int pdebugPort = m_portsGatherer->gdbServer().port(); Runnable r; r.executable = FilePath::fromString(Constants::QNX_DEBUG_EXECUTABLE); - r.commandLineArguments = pdebugPort.toString(); + r.commandLineArguments = QString::number(pdebugPort); setRunnable(r); SimpleTargetRunner::start(); |