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

Merge remote-tracking branch 'origin/3.4'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Iaff42d30008db13ecb685e5157c82292fe48b038
This commit is contained in:
Eike Ziller
2015-04-01 11:53:26 +02:00
parent 57794c170e 0501efdcd9
commit fcc6b11230
27 changed files with 570 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,6 +101,7 @@ RunControl *AndroidDebugSupport::createDebugRunControl(AndroidRunConfiguration *
if (ToolChain *tc = ToolChainKitInformation::toolChain(kit))
params.toolChainAbi = tc->targetAbi();
params.executable = target->activeBuildConfiguration()->buildDirectory().toString() + QLatin1String("/app_process");
params.skipExecutableValidation = true;
params.remoteChannel = runConfig->remoteChannel();
params.solibSearchPath = AndroidManager::androidQtSupport(target)->soLibSearchPath(target);
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(kit);

11
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -419,10 +419,19 @@ void AndroidDeployQtStep::run(QFutureInterface<bool> &fi)
}
emit addOutput(tr("Pulling files necessary for debugging."), MessageOutput);
QString localAppProcessFile = QString::fromLatin1("%1/app_process").arg(m_buildDirectory);
runCommand(m_adbPath,
AndroidDeviceInfo::adbSelector(m_serialNumber)
<< QLatin1String("pull") << QLatin1String("/system/bin/app_process")
<< QString::fromLatin1("%1/app_process").arg(m_buildDirectory));
<< localAppProcessFile);
// Workaround for QTCREATORBUG-14201: /system/bin/app_process might be a link to asan/app_process
if (!QFileInfo::exists(localAppProcessFile)) {
runCommand(m_adbPath,
AndroidDeviceInfo::adbSelector(m_serialNumber)
<< QLatin1String("pull") << QLatin1String("/system/bin/asan/app_process")
<< localAppProcessFile);
}
runCommand(m_adbPath,
AndroidDeviceInfo::adbSelector(m_serialNumber) << QLatin1String("pull")
<< QLatin1String("/system/lib/libc.so")