From 983e921c541f6eaacb9abcddb8ec079ec5129cf1 Mon Sep 17 00:00:00 2001
From: Bernd Weimer <bweimer@blackberry.com>
Date: Mon, 29 Jul 2013 17:34:24 +0200
Subject: [PATCH] Fixed QTextStream "stdin" auto tests

On some platforms (like BlackBerry) qDebug doesn't write to stderr,
so we directly write to stderr with fprintf.

Change-Id: Ib86211c98cf4da1fa2dbea4600a78e2013dc1a5a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 .../io/qtextstream/readAllStdinProcess/main.cpp       |  8 +++-----
 .../auto/corelib/io/qtextstream/stdinProcess/main.cpp | 11 +++++------
 tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp |  3 +--
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/tests/auto/corelib/io/qtextstream/readAllStdinProcess/main.cpp b/tests/auto/corelib/io/qtextstream/readAllStdinProcess/main.cpp
index 40621957ce..db2a5b53fd 100644
--- a/tests/auto/corelib/io/qtextstream/readAllStdinProcess/main.cpp
+++ b/tests/auto/corelib/io/qtextstream/readAllStdinProcess/main.cpp
@@ -40,13 +40,11 @@
 ****************************************************************************/
 
 
-#include <QtCore/QCoreApplication>
 #include <QtCore/QTextStream>
-#include <QtCore/QDebug>
+#include <stdio.h>
 
-int main(int argc, char **argv)
+int main(int, char**)
 {
-    QCoreApplication a(argc, argv);
-    qDebug() << QTextStream(stdin).readAll();
+    fprintf(stderr, "%s\n", QTextStream(stdin).readAll().toLatin1().constData());
     return 0;
 }
diff --git a/tests/auto/corelib/io/qtextstream/stdinProcess/main.cpp b/tests/auto/corelib/io/qtextstream/stdinProcess/main.cpp
index e36a2aeda8..cb4e75c6a2 100644
--- a/tests/auto/corelib/io/qtextstream/stdinProcess/main.cpp
+++ b/tests/auto/corelib/io/qtextstream/stdinProcess/main.cpp
@@ -40,17 +40,16 @@
 ****************************************************************************/
 
 
-#include <QtCore/QCoreApplication>
 #include <QtCore/QTextStream>
+#include <stdio.h>
 
-int main(int argc, char **argv)
+int main(int, char**)
 {
-    QCoreApplication a(argc, argv);
     QTextStream qin(stdin);
     if (!qin.atEnd()) {
-      int a, b, c;
-      qin >> a >> b >> c;
-      qDebug("%d %d %d", a, b, c);
+        int a, b, c;
+        qin >> a >> b >> c;
+        fprintf(stderr, "%d %d %d\n", a, b, c);
     }
     return 0;
 }
diff --git a/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp b/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp
index 56c07f1590..c19e80bff3 100644
--- a/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp
+++ b/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp
@@ -1425,8 +1425,7 @@ void tst_QTextStream::readAllFromStdin()
     stdinProcess.closeWriteChannel();
 
     QVERIFY(stdinProcess.waitForFinished(5000));
-    QChar quoteChar('"');
-    QCOMPARE(stream.readAll(), QString::fromLatin1("%1hello world%2 \n").arg(quoteChar).arg(quoteChar));
+    QCOMPARE(stream.readAll(), QString::fromLatin1("hello world\n"));
 }
 
 // ------------------------------------------------------------------------------