From 4fd8e6315778e1e0351ef074a4b0d75fcddf4942 Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@digia.com>
Date: Tue, 18 Jun 2013 11:22:24 +0200
Subject: add readAllStandardError method to our QProcessWrapper

Change-Id: I6bbce73c8346e76ae4b5ce451353bb28695a4f9a
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
---
 src/libs/installer/fsengineserver.cpp  | 2 ++
 src/libs/installer/qprocesswrapper.cpp | 8 ++++++++
 src/libs/installer/qprocesswrapper.h   | 1 +
 3 files changed, 11 insertions(+)

(limited to 'src')

diff --git a/src/libs/installer/fsengineserver.cpp b/src/libs/installer/fsengineserver.cpp
index b17e1ae0a..326a2a02a 100644
--- a/src/libs/installer/fsengineserver.cpp
+++ b/src/libs/installer/fsengineserver.cpp
@@ -408,6 +408,8 @@ QByteArray FSEngineConnectionThread::handleCommand(const QString &command)
         returnStream << process->readAll();
     } else if (command == QLatin1String("QProcess::readAllStandardOutput")) {
         returnStream << process->readAllStandardOutput();
+    } else if (command == QLatin1String("QProcess::readAllStandardError")) {
+        returnStream << process->readAllStandardError();
     } else if (command == QLatin1String("QProcess::startDetached")) {
         QString program;
         QStringList arguments;
diff --git a/src/libs/installer/qprocesswrapper.cpp b/src/libs/installer/qprocesswrapper.cpp
index 416ca9f4c..9544d6682 100644
--- a/src/libs/installer/qprocesswrapper.cpp
+++ b/src/libs/installer/qprocesswrapper.cpp
@@ -329,6 +329,14 @@ QByteArray QProcessWrapper::readAllStandardOutput()
     return d->process.readAllStandardOutput();
 }
 
+QByteArray QProcessWrapper::readAllStandardError()
+{
+    const Private::TimerBlocker blocker(this);
+    if (d->createSocket())
+        return callRemoteMethod<QByteArray>(d->stream, QLatin1String("QProcess::readAllStandardError"));
+    return d->process.readAllStandardError();
+}
+
 void QProcessWrapper::start(const QString &param1, const QStringList &param2, QIODevice::OpenMode param3)
 {
     const Private::TimerBlocker blocker(this);
diff --git a/src/libs/installer/qprocesswrapper.h b/src/libs/installer/qprocesswrapper.h
index 15e6f1fba..e7caf61f6 100644
--- a/src/libs/installer/qprocesswrapper.h
+++ b/src/libs/installer/qprocesswrapper.h
@@ -84,6 +84,7 @@ public:
     void terminate();
     QByteArray readAll();
     QByteArray readAllStandardOutput();
+    QByteArray readAllStandardError();
     void setWorkingDirectory(const QString &dir);
 
     void start(const QString &program);
-- 
cgit v1.2.3