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

Debugger: Use a QUrl for Qml server port and host

Browse Source 
Host and port reasonably belong together, using a QUrl makes that more
explicit and follows the lead of the Qml profiler in that area.

Change-Id: I754cb17d165ce6b2f25c655eeebfd8ac8f5a93c7
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
hjk
2017-08-18 12:23:42 +02:00
parent 60614d6ce1
commit c128731ff2
11 changed files with 43 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -384,7 +384,7 @@ void QmlEngine::beginConnection()
QObject::disconnect(d->startupMessageFilterConnection);
QString host = runParameters().qmlServer.host;
QString host = runParameters().qmlServer.host();
// Use localhost as default
if (host.isEmpty())
host = QHostAddress(QHostAddress::LocalHost).toString();
@@ -401,12 +401,12 @@ void QmlEngine::beginConnection()
* the connection will be closed again (instead of returning the "connection refused"
* error that we expect).
*/
Utils::Port port = runParameters().qmlServer.port;
int port = runParameters().qmlServer.port();
if (!d->connection || d->connection->isConnected())
return;
d->connection->connectToHost(host, port.number());
d->connection->connectToHost(host, port);
//A timeout to check the connection state
d->connectionTimer.start();