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

Use QProcess::kill() rather than QProcess::terminate() for adb.exe

Browse Source 
terminate (on Windows) requires a Windows Event Loop to process it
so use kill() on all platforms instead.

Change-Id: Ic38d6813c3071fde67806b10d782e5ab3b0f1a18
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Ray Donnelly
2012-12-10 23:43:21 +00:00
committed by Daniel Teske
parent 4e540ce786
commit decefcbd8f
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,7 +82,7 @@ void AndroidRunner::checkPID()
QStringList() << QLatin1String("-s") << m_deviceSerialNumber
<< QLatin1String("shell") << QLatin1String("readlink") << QLatin1String("$(which ps)"));
if (!psProc.waitForFinished(-1)) {
psProc.terminate();
psProc.kill();
return;
}
QByteArray which = psProc.readAll();
@@ -251,7 +251,7 @@ void AndroidRunner::startLogcat()
void AndroidRunner::stop()
{
QMutexLocker locker(&m_mutex);
m_adbLogcatProcess.terminate();
m_adbLogcatProcess.kill();
m_adbLogcatProcess.waitForFinished(-1);
m_checkPIDTimer.stop();
if (m_processPID == -1)
@@ -301,7 +301,7 @@ void AndroidRunner::adbKill(qint64 pid, const QString &device, int timeout, cons
process.start(AndroidConfigurations::instance().adbToolPath().toString(), arguments);
if (!process.waitForFinished(timeout))
process.terminate();
process.kill();
}
QString AndroidRunner::displayName() const