From 62b2b6f8940e3eef0828ffa39b8bf993ec4d2238 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Tue, 29 Mar 2011 16:10:05 +0200
Subject: [PATCH] Maemo: Filter NUL characters from rrpmbuild output.

---
 .../qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
index c825842b236..5084b28ea96 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
@@ -313,10 +313,12 @@ void MaemoPackageCreationStep::handleBuildOutput()
     QProcess * const buildProc = qobject_cast<QProcess *>(sender());
     if (!buildProc)
         return;
-    const QByteArray &stdOut = buildProc->readAllStandardOutput();
+    QByteArray stdOut = buildProc->readAllStandardOutput();
+    stdOut.replace('\0', QByteArray()); // Output contains NUL characters.
     if (!stdOut.isEmpty())
         emit addOutput(QString::fromLocal8Bit(stdOut), BuildStep::NormalOutput);
-    const QByteArray &errorOut = buildProc->readAllStandardError();
+    QByteArray errorOut = buildProc->readAllStandardError();
+    errorOut.replace('\0', QByteArray());
     if (!errorOut.isEmpty()) {
         emit addOutput(QString::fromLocal8Bit(errorOut), BuildStep::ErrorOutput);
     }