Merge remote-tracking branch 'origin/4.5'

Change-Id: I2d78020f10aa66fdded63883030313e0c411ce02
2017-10-15 00:23:08 +03:00
parent 5a7a8cbf74 b67bf73dc7
commit 7a04014f9f
33 changed files with 189 additions and 470 deletions
--- a/src/plugins/android/androidrunner.cpp
+++ b/src/plugins/android/androidrunner.cpp
@@ -764,6 +764,7 @@ void AndroidRunner::qmlServerPortReady(Port port)
    // host port n to target port n via adb.
    QUrl serverUrl;
    serverUrl.setPort(port.number());
+    serverUrl.setScheme(urlTcpScheme());
    emit qmlServerReady(serverUrl);
 }