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

merge addToOutputWindow and addToOutputWindowInline

Browse Source
This commit is contained in:
hjk
2011-01-07 11:34:25 +01:00
parent f48de4f567
commit 8fd480bd21
15 changed files with 70 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View File

@@ -649,9 +649,9 @@ void S60DeviceRunControl::reportDeployFinished()
}
}
void S60DeviceRunControl::processStopped(uint pc, uint pid, uint tid, const QString& reason)
void S60DeviceRunControl::processStopped(uint pc, uint pid, uint tid, const QString &reason)
{
emit addToOutputWindow(this, trk::Launcher::msgStopped(pid, tid, pc, reason), false);
emit addToOutputWindow(this, trk::Launcher::msgStopped(pid, tid, pc, reason), false, false);
m_launcher->terminate();
}
@@ -694,7 +694,7 @@ void S60DeviceRunControl::printApplicationOutput(const QString &output)
void S60DeviceRunControl::printApplicationOutput(const QString &output, bool onStdErr)
{
emit addToOutputWindowInline(this, output, onStdErr);
emit addToOutputWindow(this, output, onStdErr, true);
}
void S60DeviceRunControl::deviceRemoved(const SymbianUtils::SymbianDevice &d)