summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBogDan Vatra <bogdan@kde.org>2013-01-23 20:26:03 +0200
committerDaniel Teske <daniel.teske@digia.com>2013-01-24 12:20:30 +0100
commitb57e37243d8d8a4a993ee25c5a120638ede6368a (patch)
tree5a80506d2a359f31c297a0c965eec784e4809cff
parent6fc9c0732bda2ada8954c6ca3ba11aed970be572 (diff)
downloadqt-creator-b57e37243d8d8a4a993ee25c5a120638ede6368a.tar.gz
Fix AndroidRunner stop action.
When the stop button was pressed nothing happened Change-Id: I58a05aa3a4ea990595298cde0a330b382b65b035 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
-rw-r--r--src/plugins/android/androidrunner.cpp5
-rw-r--r--src/plugins/android/androidrunner.h1
2 files changed, 0 insertions, 6 deletions
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp
index e106f0d99b..c7367cb85a 100644
--- a/src/plugins/android/androidrunner.cpp
+++ b/src/plugins/android/androidrunner.cpp
@@ -254,16 +254,11 @@ void AndroidRunner::startLogcat()
void AndroidRunner::stop()
{
QMutexLocker locker(&m_mutex);
- m_adbLogcatProcess.kill();
m_checkPIDTimer.stop();
if (m_processPID == -1) {
m_adbLogcatProcess.kill();
return; // don't emit another signal
}
-}
-
-void AndroidRunner::asyncStop()
-{
killPID();
m_adbLogcatProcess.kill();
m_adbLogcatProcess.waitForFinished(-1);
diff --git a/src/plugins/android/androidrunner.h b/src/plugins/android/androidrunner.h
index a3ec69e388..1d1d485161 100644
--- a/src/plugins/android/androidrunner.h
+++ b/src/plugins/android/androidrunner.h
@@ -56,7 +56,6 @@ public:
public slots:
void start();
void stop();
- void asyncStop();
signals:
void remoteProcessStarted(int gdbServerPort = -1, int qmlPort = -1);