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

Remove AndroidRunner::asyncStop; always stop synchronously.

Browse Source 
Change-Id: Ide262b32146cca6abdb59c26969deb64f255cf10
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Ray Donnelly
2012-12-12 14:35:38 +00:00
committed by Daniel Teske
parent 9917f9a71b
commit 7857b9c955
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -256,10 +256,6 @@ void AndroidRunner::stop()
m_checkPIDTimer.stop(); m_checkPIDTimer.stop();
if (m_processPID == -1) if (m_processPID == -1)
return; // don't emit another signal return; // don't emit another signal
QtConcurrent::run(this, &AndroidRunner::asyncStop);
}
void AndroidRunner::asyncStop()
{
killPID(); killPID();
emit remoteProcessFinished(tr("\n\n'%1' killed.").arg(m_packageName)); emit remoteProcessFinished(tr("\n\n'%1' killed.").arg(m_packageName));
} }

1
src/plugins/android/androidrunner.h
View File

@@ -71,7 +71,6 @@ private slots:
void logcatReadStandardOutput(); void logcatReadStandardOutput();
void startLogcat(); void startLogcat();
void asyncStart(); void asyncStart();
void asyncStop();
private: private:
void adbKill(qint64 pid, const QString &device, int timeout = 2000, const QString &runAsPackageName = QString()); void adbKill(qint64 pid, const QString &device, int timeout = 2000, const QString &runAsPackageName = QString());