diff options
| author | Ray Donnelly <[email protected]> | 2012-12-10 23:43:21 +0000 |
|---|---|---|
| committer | Daniel Teske <[email protected]> | 2012-12-13 12:57:24 +0100 |
| commit | decefcbd8f3e690cbd824b3c91d19a735dff6eae (patch) | |
| tree | 175ebaf5e1aa1875702f8c38883e60bd2fe0331f /src/plugins/android/androidrunner.cpp | |
| parent | 4e540ce7862b95a0bb1d1fdeaf3a0e0919e5c603 (diff) | |
Use QProcess::kill() rather than QProcess::terminate() for adb.exe
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 <[email protected]>
Diffstat (limited to 'src/plugins/android/androidrunner.cpp')
| -rw-r--r-- | src/plugins/android/androidrunner.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index a1843c4e9a5..cbf6c35787d 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -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 |