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

ios: always write out when a run ends

Browse Source 
Currently normal end of an ios run is silent. This looks strange as
the startup writes a string.

Change-Id: I64d082153b11ff6db4d6b1d85bce1da143cf329d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
Fawzi Mohamed
2014-04-07 16:17:12 +02:00
parent a17c231b07
commit 152f9c3646
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/ios/iosanalyzesupport.cpp
View File

@@ -150,8 +150,10 @@ void IosAnalyzeSupport::handleGotInferiorPid(Q_PID pid, int qmlPort)
void IosAnalyzeSupport::handleRemoteProcessFinished(bool cleanEnd) void IosAnalyzeSupport::handleRemoteProcessFinished(bool cleanEnd)
{ {
Q_UNUSED(cleanEnd)
if (m_runControl) { if (m_runControl) {
if (!cleanEnd)
m_runControl->logApplicationMessage(tr("Run ended with error."), Utils::ErrorMessageFormat);
else
m_runControl->logApplicationMessage(tr("Run ended."), Utils::NormalMessageFormat); m_runControl->logApplicationMessage(tr("Run ended."), Utils::NormalMessageFormat);
m_runControl->notifyRemoteFinished(); m_runControl->notifyRemoteFinished();
} }

9
src/plugins/ios/iosdebugsupport.cpp
View File

@@ -226,11 +226,14 @@ void IosDebugSupport::handleGotInferiorPid(Q_PID pid, int qmlPort)
void IosDebugSupport::handleRemoteProcessFinished(bool cleanEnd) void IosDebugSupport::handleRemoteProcessFinished(bool cleanEnd)
{ {
if (!cleanEnd && m_runControl) if (m_runControl) {
m_runControl->showMessage(tr("Run failed unexpectedly."), AppStuff); if (!cleanEnd)
//m_runControl->engine()->notifyInferiorIll(); m_runControl->showMessage(tr("Run ended with error."), AppStuff);
else
m_runControl->showMessage(tr("Run ended."), AppStuff);
m_runControl->engine()->abortDebugger(); m_runControl->engine()->abortDebugger();
} }
}
void IosDebugSupport::handleRemoteOutput(const QString &output) void IosDebugSupport::handleRemoteOutput(const QString &output)
{ {

4
src/plugins/ios/iosruncontrol.cpp
View File

@@ -77,7 +77,9 @@ RunControl::StopResult IosRunControl::stop()
void IosRunControl::handleRemoteProcessFinished(bool cleanEnd) void IosRunControl::handleRemoteProcessFinished(bool cleanEnd)
{ {
if (!cleanEnd) if (!cleanEnd)
appendMessage(tr("Run ended unexpectedly."), Utils::ErrorMessageFormat); appendMessage(tr("Run ended with error."), Utils::ErrorMessageFormat);
else
appendMessage(tr("Run ended."), Utils::NormalMessageFormat);
disconnect(m_runner, 0, this, 0); disconnect(m_runner, 0, this, 0);
m_running = false; m_running = false;
emit finished(); emit finished();