Merge remote-tracking branch 'origin/2.6'

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidrunner.cpp
	src/plugins/projectexplorer/kitmanager.cpp

Change-Id: I653ddaef6e341818fc74aacfe30e89c07f40a8c6

1 files changed, 10 insertions, 2 deletions

diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp
index cbf6c35787..0df3536f6f 100644
--- a/src/plugins/android/androidrunner.cpp
+++ b/src/plugins/android/androidrunner.cpp
@@ -68,7 +68,7 @@ AndroidRunner::AndroidRunner(QObject *parent, AndroidRunConfiguration *runConfig
 
 AndroidRunner::~AndroidRunner()
 {
-    stop();
+    stop(false);
 }
 
 void AndroidRunner::checkPID()
@@ -248,7 +248,7 @@ void AndroidRunner::startLogcat()
     emit remoteProcessStarted(5039);
 }
 
-void AndroidRunner::stop()
+void AndroidRunner::stop(bool async)
 {
     QMutexLocker locker(&m_mutex);
     m_adbLogcatProcess.kill();
@@ -256,6 +256,14 @@ void AndroidRunner::stop()
     m_checkPIDTimer.stop();
     if (m_processPID == -1)
         return; // don't emit another signal
+    if (async)
+        QtConcurrent::run(this, &AndroidRunner::asyncStop);
+    else
+        asyncStop();
+}
+
+void AndroidRunner::asyncStop()
+{
     killPID();
     emit remoteProcessFinished(tr("\n\n'%1' killed.").arg(m_packageName));
 }