Adapt merge to master change

Change-Id: I579d20ad87f6e8a79322c05a091e2bb64d670740
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2017-11-14 14:06:44 +01:00
parent 1cbaa97d90
commit 6f3976ec4c

View File

@@ -48,6 +48,7 @@
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <utils/url.h>
#include <utils/utilsicons.h> #include <utils/utilsicons.h>
#include <QDateTime> #include <QDateTime>
@@ -406,7 +407,7 @@ void IosQmlProfilerSupport::start()
QTcpServer server; QTcpServer server;
QTC_ASSERT(server.listen(QHostAddress::LocalHost) QTC_ASSERT(server.listen(QHostAddress::LocalHost)
|| server.listen(QHostAddress::LocalHostIPv6), return); || server.listen(QHostAddress::LocalHostIPv6), return);
serverUrl.setScheme(urlTcpScheme()); serverUrl.setScheme(Utils::urlTcpScheme());
serverUrl.setHost(server.serverAddress().toString()); serverUrl.setHost(server.serverAddress().toString());
Port qmlPort = m_runner->qmlServerPort(); Port qmlPort = m_runner->qmlServerPort();