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

10
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -376,7 +376,7 @@ void QmlEngine::beginConnection(Utils::Port port)
QTC_ASSERT(state() == EngineRunRequested, return);
QString host = runParameters().qmlServerAddress;
QString host = runParameters().qmlServer.host;
// Use localhost as default
if (host.isEmpty())
host = "localhost";
@@ -392,8 +392,8 @@ void QmlEngine::beginConnection(Utils::Port port)
* the connection will be closed again (instead of returning the "connection refused"
* error that we expect).
*/
if (runParameters().qmlServerPort.isValid())
port = runParameters().qmlServerPort;
if (runParameters().qmlServer.port.isValid())
port = runParameters().qmlServer.port;
if (!d->connection || d->connection->isConnected())
return;
@@ -564,7 +564,7 @@ void QmlEngine::notifyEngineRemoteSetupFinished(const RemoteSetupResult &result)
if (result.success) {
if (result.qmlServerPort.isValid())
runParameters().qmlServerPort = result.qmlServerPort;
runParameters().qmlServer.port = result.qmlServerPort;
notifyEngineSetupOk();
@@ -587,7 +587,7 @@ void QmlEngine::notifyEngineRemoteServerRunning(const QString &serverChannel, in
bool ok = false;
quint16 qmlPort = serverChannel.toUInt(&ok);
if (ok)
runParameters().qmlServerPort = Utils::Port(qmlPort);
runParameters().qmlServer.port = Utils::Port(qmlPort);
else
qWarning() << tr("QML debugging port not set: Unable to convert %1 to unsigned int.").arg(serverChannel);