Commit 57738988 authored by BogDan Vatra's avatar BogDan Vatra Committed by Daniel Teske
Browse files

Remove useless warning dialog.



Redirect the errors to the application output window.

Change-Id: I927fae72a53314d0200ffbd13c68900d15259cf9
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent f504ce8b
......@@ -156,9 +156,8 @@ void AndroidDebugSupport::handleRemoteProcessStarted(int gdbServerPort, int qmlP
void AndroidDebugSupport::handleRemoteProcessFinished(const QString &errorMsg)
{
disconnect(m_runner, SIGNAL(remoteProcessFinished(QString)),
this,SLOT(handleRemoteProcessFinished(QString)));
m_runControl->engine()->notifyEngineRemoteSetupFailed(errorMsg);
if (m_runControl)
m_runControl->showMessage(errorMsg, AppStuff);
}
void AndroidDebugSupport::handleRemoteOutput(const QByteArray &output)
......
......@@ -71,7 +71,7 @@ void AndroidRunControl::start()
RunControl::StopResult AndroidRunControl::stop()
{
m_runner->stop(true);
m_runner->stop();
return StoppedSynchronously;
}
......
......@@ -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()
......
......@@ -55,7 +55,7 @@ public:
public slots:
void start();
void stop(bool async);
void stop();
void asyncStop();
signals:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment