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

Maemo: More adaptations to fixed outout window newline handling.

Browse Source
This commit is contained in:
Christian Kandeler
2011-03-31 18:23:01 +02:00
parent 2407f4258f
commit 759732c89d
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.cpp
View File

@@ -190,9 +190,10 @@ void AbstractMaemoDeployStep::raiseError(const QString &errorString)
emit error(); emit error();
} }
void AbstractMaemoDeployStep::writeOutput(const QString &text, OutputFormat format) void AbstractMaemoDeployStep::writeOutput(const QString &text, OutputFormat format,
OutputNewlineSetting newlineSetting)
{ {
emit addOutput(text, format); emit addOutput(text, format, newlineSetting);
} }
void AbstractMaemoDeployStep::stop() void AbstractMaemoDeployStep::stop()
@@ -377,7 +378,7 @@ void AbstractMaemoDeployStep::handleRemoteStdout(const QString &output)
switch (m_baseState) { switch (m_baseState) {
case Deploying: case Deploying:
case StopRequested: case StopRequested:
writeOutput(output, NormalOutput); writeOutput(output, NormalOutput, DontAppendNewline);
break; break;
default: default:
break; break;
@@ -391,7 +392,7 @@ void AbstractMaemoDeployStep::handleRemoteStderr(const QString &output)
switch (m_baseState) { switch (m_baseState) {
case Deploying: case Deploying:
case StopRequested: case StopRequested:
writeOutput(output, ErrorOutput); writeOutput(output, ErrorOutput, DontAppendNewline);
break; break;
default: default:
break; break;

3
src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.h
View File

@@ -89,7 +89,8 @@ protected:
BaseState baseState() const { return m_baseState; } BaseState baseState() const { return m_baseState; }
void raiseError(const QString &error); void raiseError(const QString &error);
void writeOutput(const QString &text, OutputFormat = MessageOutput); void writeOutput(const QString &text, OutputFormat format = MessageOutput,
OutputNewlineSetting newlineSetting = DoAppendNewline);
void setDeploymentFinished(); void setDeploymentFinished();
const AbstractMaemoPackageCreationStep *packagingStep() const; const AbstractMaemoPackageCreationStep *packagingStep() const;
QString deployMountPoint() const; QString deployMountPoint() const;

2
src/plugins/qt4projectmanager/qt-maemo/maemodeploybymountstep.cpp
View File

@@ -147,7 +147,7 @@ void AbstractMaemoDeployByMountStep::handleMountDebugOutput(const QString &outpu
ASSERT_BASE_STATE(QList<BaseState>() << Deploying << StopRequested); ASSERT_BASE_STATE(QList<BaseState>() << Deploying << StopRequested);
if (m_extendedState != Inactive) if (m_extendedState != Inactive)
writeOutput(output, ErrorOutput); writeOutput(output, ErrorOutput, DontAppendNewline);
} }
void AbstractMaemoDeployByMountStep::mount() void AbstractMaemoDeployByMountStep::mount()