Merge remote-tracking branch 'origin/4.5'

Change-Id: Ib6739725e6b251ea962880e4b72700c5be5a192c
2017-11-14 11:23:57 +01:00
parent e865261c49 b39687645d
commit 2d30d3ddd6
13 changed files with 67 additions and 21 deletions
--- a/src/plugins/ios/iosrunner.cpp
+++ b/src/plugins/ios/iosrunner.cpp
@@ -406,6 +406,7 @@ void IosQmlProfilerSupport::start()
    QTcpServer server;
    QTC_ASSERT(server.listen(QHostAddress::LocalHost)
               || server.listen(QHostAddress::LocalHostIPv6), return);
+    serverUrl.setScheme(urlTcpScheme());
    serverUrl.setHost(server.serverAddress().toString());

    Port qmlPort = m_runner->qmlServerPort();