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

Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline

Browse Source 
Conflicts:
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
This commit is contained in:
con
2011-04-01 10:33:20 +02:00
parent 1c2da511b9 759732c89d
commit 7bd87aed36
15 changed files with 115 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
View File

@@ -144,11 +144,13 @@ void AbstractMaemoPackageCreationStep::handleBuildOutput()
QByteArray stdOut = buildProc->readAllStandardOutput();
stdOut.replace('\0', QByteArray()); // Output contains NUL characters.
if (!stdOut.isEmpty())
emit addOutput(QString::fromLocal8Bit(stdOut), BuildStep::NormalOutput);
emit addOutput(QString::fromLocal8Bit(stdOut), BuildStep::NormalOutput,
BuildStep::DontAppendNewline);
QByteArray errorOut = buildProc->readAllStandardError();
errorOut.replace('\0', QByteArray());
if (!errorOut.isEmpty()) {
emit addOutput(QString::fromLocal8Bit(errorOut), BuildStep::ErrorOutput);
emit addOutput(QString::fromLocal8Bit(errorOut), BuildStep::ErrorOutput,
BuildStep::DontAppendNewline);
}
}