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

Fix debugging for x86 and armv7 Android builds

Browse Source 
Fixes: QTCREATORBUG-24191
Change-Id: I7b3033f47a4eb0f63be351576df1540e98edb903
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Joni Poikelin
2020-06-16 15:46:36 +03:00
parent 5ca17578d5
commit dcf2f16384
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -447,8 +447,12 @@ bool AndroidDeployQtStep::runImpl()
if (!m_filesToPull.isEmpty()) if (!m_filesToPull.isEmpty())
emit addOutput(tr("Pulling files necessary for debugging."), OutputFormat::NormalMessage); emit addOutput(tr("Pulling files necessary for debugging."), OutputFormat::NormalMessage);
// Note that values are not necessarily unique, e.g. app_process is looked up in several directories
for (auto itr = m_filesToPull.constBegin(); itr != m_filesToPull.constEnd(); ++itr) { for (auto itr = m_filesToPull.constBegin(); itr != m_filesToPull.constEnd(); ++itr) {
QFile::remove(itr.value()); QFile::remove(itr.value());
}
for (auto itr = m_filesToPull.constBegin(); itr != m_filesToPull.constEnd(); ++itr) {
runCommand({m_adbPath, runCommand({m_adbPath,
AndroidDeviceInfo::adbSelector(m_serialNumber) AndroidDeviceInfo::adbSelector(m_serialNumber)
<< "pull" << itr.key() << itr.value()}); << "pull" << itr.key() << itr.value()});