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

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

@@ -441,8 +441,10 @@ static DebuggerRunControl *doCreate(DebuggerRunParameters rp, RunConfiguration *
errors->append(DebuggerPlugin::tr("Not enough free ports for QML debugging.") + ' ');
return 0;
}
rp.qmlServerAddress = server.serverAddress().toString();
rp.qmlServerPort = Utils::Port(server.serverPort());
TcpServerConnection conn;
conn.host = server.serverAddress().toString();
conn.port = Utils::Port(server.serverPort());
rp.qmlServer = conn;
// Makes sure that all bindings go through the JavaScript engine, so that
// breakpoints are actually hit!
@@ -482,7 +484,7 @@ static DebuggerRunControl *doCreate(DebuggerRunParameters rp, RunConfiguration *
QtcProcess::addArg(&rp.inferior.commandLineArguments,
(rp.languages & CppLanguage) && rp.nativeMixedEnabled ?
QmlDebug::qmlDebugNativeArguments(service, false) :
QmlDebug::qmlDebugTcpArguments(service, rp.qmlServerPort));
QmlDebug::qmlDebugTcpArguments(service, rp.qmlServer.port));
}
}
}