diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp index 11fabdccfdb..84ed1bf52db 100644 --- a/src/plugins/android/androiddebugsupport.cpp +++ b/src/plugins/android/androiddebugsupport.cpp @@ -44,6 +44,7 @@ #include #include +#include using namespace Debugger; using namespace ProjectExplorer; @@ -131,7 +132,10 @@ void AndroidDebugSupport::start() + "/app_process"); setSkipExecutableValidation(true); setUseExtendedRemote(true); - setRemoteChannel(":" + m_runner->gdbServerPort().toString()); + QUrl gdbServer; + gdbServer.setHost(QHostAddress(QHostAddress::LocalHost).toString()); + gdbServer.setPort(m_runner->gdbServerPort().number()); + setRemoteChannel(gdbServer); setSysRoot(AndroidConfigurations::currentConfig().ndkLocation().appendPath("platforms") .appendPath(QString("android-%1").arg(AndroidManager::minimumSDK(target))) .appendPath(toNdkArch(AndroidManager::targetArch(target))).toString()); diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index 4ea111aeb3b..06475a3118e 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -34,6 +34,7 @@ #include "androidavdmanager.h" #include "androidrunnerworker.h" +#include #include #include #include @@ -197,6 +198,7 @@ void AndroidRunner::qmlServerPortReady(Port port) // device side. It only happens to work since we redirect // host port n to target port n via adb. QUrl serverUrl; + serverUrl.setHost(QHostAddress(QHostAddress::LocalHost).toString()); serverUrl.setPort(port.number()); serverUrl.setScheme(urlTcpScheme()); emit qmlServerReady(serverUrl); diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index d4bb5cc899c..39239bf6424 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -166,8 +166,7 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa QTC_CHECK(m_localGdbServerPort.isValid()); if (m_qmlDebugServices != QmlDebug::NoQmlDebugServices) { QTcpServer server; - QTC_ASSERT(server.listen(QHostAddress::LocalHost) - || server.listen(QHostAddress::LocalHostIPv6), + QTC_ASSERT(server.listen(QHostAddress::LocalHost), qDebug() << tr("No free ports available on host for QML debugging.")); m_qmlServer.setScheme(Utils::urlTcpScheme()); m_qmlServer.setHost(server.serverAddress().toString());