feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Use more QUrl in channel-ish interfaces

Browse Source 
Change-Id: I978b18b4d79ce927ae4801955558b9f24dbcb64e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-12-19 13:01:02 +01:00
parent f06d97c67f
commit c06212a255
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -318,6 +318,11 @@ void DebuggerRunTool::setRemoteChannel(const QString &channel)
m_runParameters.remoteChannel = channel;
}
void DebuggerRunTool::setRemoteChannel(const QUrl &url)
{
m_runParameters.remoteChannel = QString("%1:%2").arg(url.host()).arg(url.port());
}
void DebuggerRunTool::setRemoteChannel(const QString &host, int port)
{
m_runParameters.remoteChannel = QString("%1:%2").arg(host).arg(port);
@@ -506,7 +511,7 @@ void DebuggerRunTool::start()
TaskHub::clearTasks(Debugger::Constants::TASK_CATEGORY_DEBUGGER_RUNTIME);
if (d->portsGatherer) {
setRemoteChannel(d->portsGatherer->gdbServerChannel());
setRemoteChannel(d->portsGatherer->gdbServer());
setQmlServer(d->portsGatherer->qmlServer());
if (d->addQmlServerInferiorCommandLineArgumentIfNeeded
&& m_runParameters.isQmlDebugging
@@ -969,11 +974,9 @@ Port GdbServerPortsGatherer::gdbServerPort() const
return Port(url.port());
}
QString GdbServerPortsGatherer::gdbServerChannel() const
QUrl GdbServerPortsGatherer::gdbServer() const
{
QUrl url = channel(0);
const QString host = m_device->sshParameters().host();
return QString("%1:%2").arg(host).arg(url.port());
return channel(0);
}
Port GdbServerPortsGatherer::qmlServerPort() const