From decefcbd8f3e690cbd824b3c91d19a735dff6eae Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Mon, 10 Dec 2012 23:43:21 +0000
Subject: [PATCH] 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 <daniel.teske@digia.com>
---
 src/plugins/android/androidconfigurations.cpp      | 8 ++++----
 src/plugins/android/androidmanager.cpp             | 2 +-
 src/plugins/android/androidpackagecreationstep.cpp | 6 +++---
 src/plugins/android/androidrunner.cpp              | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 57f75dc526e..20d51337478 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -412,7 +412,7 @@ QVector<AndroidDeviceInfo> AndroidConfigurations::connectedDevices(int apiLevel)
     QProcess adbProc;
     adbProc.start(adbToolPath().toString(), QStringList() << QLatin1String("devices"));
     if (!adbProc.waitForFinished(-1)) {
-        adbProc.terminate();
+        adbProc.kill();
         return devices;
     }
     QList<QByteArray> adbDevs = adbProc.readAll().trimmed().split('\n');
@@ -565,7 +565,7 @@ QString AndroidConfigurations::startAVD(int *apiLevel, const QString &name) cons
     proc.start(adbToolPath().toString(), QStringList() << QLatin1String("-e") << QLatin1String("wait-for-device"));
     while (!proc.waitForFinished(500)) {
         if (avdProcess->waitForFinished(0)) {
-            proc.terminate();
+            proc.kill();
             proc.waitForFinished(-1);
             return QString();
         }
@@ -575,7 +575,7 @@ QString AndroidConfigurations::startAVD(int *apiLevel, const QString &name) cons
     // workaround for stupid adb bug
     proc.start(adbToolPath().toString(), QStringList() << QLatin1String("devices"));
     if (!proc.waitForFinished(-1)) {
-        proc.terminate();
+        proc.kill();
         return QString();
     }
 
@@ -597,7 +597,7 @@ int AndroidConfigurations::getSDKVersion(const QString &device) const
                   << QLatin1String("shell") << QLatin1String("getprop")
                   << QLatin1String("ro.build.version.sdk"));
     if (!adbProc.waitForFinished(-1)) {
-        adbProc.terminate();
+        adbProc.kill();
         return -1;
     }
     return adbProc.readAll().trimmed().toInt();
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index 926fa395f56..46f86818410 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -852,7 +852,7 @@ QStringList AndroidManager::dependencies(const Utils::FileName &readelfPath, con
     readelfProc.start(readelfPath.toString(), QStringList() << QLatin1String("-d") << QLatin1String("-W") << lib);
 
     if (!readelfProc.waitForFinished(-1)) {
-        readelfProc.terminate();
+        readelfProc.kill();
         return libs;
     }
 
diff --git a/src/plugins/android/androidpackagecreationstep.cpp b/src/plugins/android/androidpackagecreationstep.cpp
index 36a032f315e..a14873ec8ab 100644
--- a/src/plugins/android/androidpackagecreationstep.cpp
+++ b/src/plugins/android/androidpackagecreationstep.cpp
@@ -203,7 +203,7 @@ void AndroidPackageCreationStep::checkRequiredLibraries()
     readelfProc.start(AndroidConfigurations::instance().readelfPath(target()->activeRunConfiguration()->abi().architecture()).toString(),
                       QStringList() << QLatin1String("-d") << QLatin1String("-W") << appPath);
     if (!readelfProc.waitForFinished(-1)) {
-        readelfProc.terminate();
+        readelfProc.kill();
         return;
     }
     QStringList libs;
@@ -250,7 +250,7 @@ void AndroidPackageCreationStep::checkRequiredLibrariesForRun()
     }
     readelfProc.start(m_readElf.toString(), QStringList() << QLatin1String("-d") << QLatin1String("-W") << m_appPath.toUserOutput());
     if (!readelfProc.waitForFinished(-1)) {
-        readelfProc.terminate();
+        readelfProc.kill();
         return;
     }
     QStringList libs;
@@ -467,7 +467,7 @@ void AndroidPackageCreationStep::stripAndroidLibs(const QStringList & files, Abi
                            QStringList()<<QLatin1String("--strip-unneeded") << file);
         stripProcess.waitForStarted();
         if (!stripProcess.waitForFinished())
-            stripProcess.terminate();
+            stripProcess.kill();
     }
 }
 
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