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

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/android/androiddebugsupport.cpp

Change-Id: I01c4880850ad25432a65bb32849365d2aeb0756f
This commit is contained in:
Eike Ziller
2018-07-10 07:44:53 +02:00
parent d20464d56f 3300182d40
commit d09b71d260
31 changed files with 369 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androiddebugsupport.cpp
View File

@@ -45,6 +45,7 @@
#include <QDirIterator>
#include <QLoggingCategory>
#include <QHostAddress>
namespace {
Q_LOGGING_CATEGORY(androidDebugSupportLog, "qtc.android.run.androiddebugsupport")
@@ -142,7 +143,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);
QString sysRoot = AndroidConfigurations::currentConfig().ndkLocation().appendPath("platforms")
.appendPath(QString("android-%1").arg(AndroidManager::minimumSDK(target)))