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

Android: Clen libs on device: Fix memory leak

Browse Source 
One QProcess per run of clean libs

Change-Id: Idcf6155e71ca5cec7cb4be1509191ba49c69cefd
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
This commit is contained in:
Daniel Teske
2013-05-23 12:27:28 +02:00
parent dc2096e83f
commit 86110d7038
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)