Commit 86110d70 authored by Daniel Teske's avatar Daniel Teske
Browse files

Android: Clen libs on device: Fix memory leak



One QProcess per run of clean libs

Change-Id: Idcf6155e71ca5cec7cb4be1509191ba49c69cefd
Reviewed-by: default avatarEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
parent dc2096e8
...@@ -190,16 +190,18 @@ void AndroidDeployStep::cleanLibsOnDevice() ...@@ -190,16 +190,18 @@ void AndroidDeployStep::cleanLibsOnDevice()
+ arguments.join(QLatin1String(" ")), + arguments.join(QLatin1String(" ")),
Core::MessageManager::NoModeSwitch); Core::MessageManager::NoModeSwitch);
process->start(adb, arguments); process->start(adb, arguments);
if (!process->waitForStarted(500))
delete process;
} }
void AndroidDeployStep::cleanLibsFinished() void AndroidDeployStep::cleanLibsFinished()
{ {
QProcess *process = qobject_cast<QProcess *>(sender()); QProcess *process = qobject_cast<QProcess *>(sender());
if (!process) QTC_ASSERT(process, return);
return;
Core::MessageManager::instance()->printToOutputPane(QString::fromLocal8Bit(process->readAll()), Core::MessageManager::NoModeSwitch); Core::MessageManager::instance()->printToOutputPane(QString::fromLocal8Bit(process->readAll()), Core::MessageManager::NoModeSwitch);
Core::MessageManager::instance()->printToOutputPane(tr("adb finished with exit code %1.").arg(process->exitCode()), Core::MessageManager::instance()->printToOutputPane(tr("adb finished with exit code %1.").arg(process->exitCode()),
Core::MessageManager::NoModeSwitch); Core::MessageManager::NoModeSwitch);
process->deleteLater();
} }
void AndroidDeployStep::setDeployAction(AndroidDeployStep::AndroidDeployAction deploy) void AndroidDeployStep::setDeployAction(AndroidDeployStep::AndroidDeployAction deploy)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment