From 9ccaecf7825a782bfd29ff6c4118d933cc614726 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 26 Nov 2010 11:41:53 +1000
Subject: Slightly improved tst_qmlvisual output

---
 tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
index 7fee24f..ef0d4dc 100644
--- a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
+++ b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
@@ -146,11 +146,12 @@ void tst_qmlvisual::visual()
 #endif
 
     QProcess p;
-    p.setProcessChannelMode(QProcess::MergedChannels);
     p.start(qmlruntime, arguments);
-    QVERIFY2(p.waitForFinished(), p.readAllStandardOutput().data());
+    bool finished = p.waitForFinished();
+    QByteArray output = p.readAllStandardOutput() + p.readAllStandardError();
+    QVERIFY2(finished, output.data());
     if (p.exitCode() != 0)
-        qDebug() << p.readAllStandardOutput();
+        qDebug() << output;
     QCOMPARE(p.exitStatus(), QProcess::NormalExit);
     QCOMPARE(p.exitCode(), 0);
 }
-- 
cgit v0.12