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

Maemo: Filter NUL characters from rrpmbuild output.

Browse Source
This commit is contained in:
Christian Kandeler
2011-03-29 16:10:05 +02:00
parent 92c0a301db
commit 62b2b6f894
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -313,10 +313,12 @@ void MaemoPackageCreationStep::handleBuildOutput()
QProcess * const buildProc = qobject_cast<QProcess *>(sender()); QProcess * const buildProc = qobject_cast<QProcess *>(sender());
if (!buildProc) if (!buildProc)
return; return;
const QByteArray &stdOut = buildProc->readAllStandardOutput(); QByteArray stdOut = buildProc->readAllStandardOutput();
stdOut.replace('\0', QByteArray()); // Output contains NUL characters.
if (!stdOut.isEmpty()) if (!stdOut.isEmpty())
emit addOutput(QString::fromLocal8Bit(stdOut), BuildStep::NormalOutput); emit addOutput(QString::fromLocal8Bit(stdOut), BuildStep::NormalOutput);
const QByteArray &errorOut = buildProc->readAllStandardError(); QByteArray errorOut = buildProc->readAllStandardError();
errorOut.replace('\0', QByteArray());
if (!errorOut.isEmpty()) { if (!errorOut.isEmpty()) {
emit addOutput(QString::fromLocal8Bit(errorOut), BuildStep::ErrorOutput); emit addOutput(QString::fromLocal8Bit(errorOut), BuildStep::ErrorOutput);
} }