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-maemo/maemoruncontrol.cpp
View File

@@ -119,12 +119,12 @@ void MaemoRunControl::handleRemoteProcessFinished(qint64 exitCode)
void MaemoRunControl::handleRemoteOutput(const QByteArray &output)
{
emit addToOutputWindowInline(this, QString::fromUtf8(output), false);
emit addToOutputWindow(this, QString::fromUtf8(output), false, true);
}
void MaemoRunControl::handleRemoteErrorOutput(const QByteArray &output)
{
emit addToOutputWindowInline(this, QString::fromUtf8(output), true);
emit addToOutputWindow(this, QString::fromUtf8(output), true, true);
}
void MaemoRunControl::handleProgressReport(const QString &progressString)
@@ -134,7 +134,7 @@ void MaemoRunControl::handleProgressReport(const QString &progressString)
void MaemoRunControl::handleMountDebugOutput(const QString &output)
{
emit addToOutputWindowInline(this, output, true);
emit addToOutputWindow(this, output, true, true);
}
bool MaemoRunControl::isRunning() const