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

Debugger: Use dedicated structure for Qml server parameters

Browse Source 
The main idea is to start using ProjectExplorer::Connection later.

Change-Id: Ie91eacdfb0e93ae142fec7ce32bcf554a5282122
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2016-06-13 14:18:50 +02:00
parent 7e8d9835f7
commit 78a800cb34
9 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -2135,8 +2135,8 @@ void DebuggerPluginPrivate::attachToQmlPort()
const QVariant qmlServerPort = configValue("LastQmlServerPort");
if (qmlServerPort.isValid())
dlg.setPort(qmlServerPort.toInt());
else if (rp.qmlServerPort.isValid())
dlg.setPort(rp.qmlServerPort.number());
else if (rp.qmlServer.port.isValid())
dlg.setPort(rp.qmlServer.port.number());
else
dlg.setPort(-1);
@@ -2157,9 +2157,9 @@ void DebuggerPluginPrivate::attachToQmlPort()
rp.connParams = device->sshParameters();
Connection toolControl = device->toolControlChannel(IDevice::QmlControlChannel);
QTC_ASSERT(toolControl.is<HostName>(), return);
rp.qmlServerAddress = toolControl.as<HostName>().host();
rp.qmlServer.host = toolControl.as<HostName>().host();
}
rp.qmlServerPort = Utils::Port(dlg.port());
rp.qmlServer.port = Utils::Port(dlg.port());
rp.startMode = AttachToRemoteProcess;
rp.closeMode = KillAtClose;
rp.languages = QmlLanguage;
@@ -2903,11 +2903,11 @@ static QString formatStartParameters(DebuggerRunParameters &sp)
str << "Addtional Search Directories:"
<< sp.additionalSearchDirectories.join(QLatin1Char(' ')) << '\n';
}
if (!sp.qmlServerAddress.isEmpty())
str << "QML server: " << sp.qmlServerAddress << ':'
<< (sp.qmlServerPort.isValid() ? sp.qmlServerPort.number() : -1) << '\n';
if (!sp.remoteChannel.isEmpty())
str << "Remote: " << sp.remoteChannel << '\n';
if (!sp.qmlServer.host.isEmpty())
str << "QML server: " << sp.qmlServer.host << ':'
<< (sp.qmlServer.port.isValid() ? sp.qmlServer.port.number() : -1) << '\n';
str << "Sysroot: " << sp.sysRoot << '\n';
str << "Debug Source Location: " << sp.debugSourceLocation.join(QLatin1Char(':')) << '\n';
return rc;