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

Remove useless warning dialog.

Browse Source 
Redirect the errors to the application output window.

Change-Id: I927fae72a53314d0200ffbd13c68900d15259cf9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
BogDan Vatra
2012-12-18 14:25:07 +02:00
committed by Daniel Teske
parent f504ce8b8e
commit 57738988f2
4 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,7 +69,7 @@ AndroidRunner::AndroidRunner(QObject *parent, AndroidRunConfiguration *runConfig
AndroidRunner::~AndroidRunner()
{
stop(false);
stop();
}
void AndroidRunner::checkPID()
@@ -251,24 +251,22 @@ void AndroidRunner::startLogcat()
emit remoteProcessStarted(5039);
}
void AndroidRunner::stop(bool async)
void AndroidRunner::stop()
{
QMutexLocker locker(&m_mutex);
m_adbLogcatProcess.kill();
m_adbLogcatProcess.waitForFinished(-1);
m_checkPIDTimer.stop();
if (m_processPID == -1)
if (m_processPID == -1) {
m_adbLogcatProcess.kill();
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));
m_adbLogcatProcess.kill();
m_adbLogcatProcess.waitForFinished(-1);
}
void AndroidRunner::logcatReadStandardError()