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

Merge remote-tracking branch 'origin/2.6'

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

Change-Id: I653ddaef6e341818fc74aacfe30e89c07f40a8c6
This commit is contained in:
Oswald Buddenhagen
2013-01-16 16:42:56 +01:00
parent 72e3605a01 6ec9dd10a5
commit 65c169c80e
23 changed files with 299 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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));
}