1 files changed, 28 insertions, 12 deletions

diff --git a/src/libs/installer/qprocesswrapper.cpp b/src/libs/installer/qprocesswrapper.cpp
index 020624425..9544d6682 100644
--- a/src/libs/installer/qprocesswrapper.cpp
+++ b/src/libs/installer/qprocesswrapper.cpp
@@ -54,16 +54,16 @@ class QProcessWrapper::Private
 {
 public:
     Private(QProcessWrapper *qq)
-        : q(qq),
-          ignoreTimer(false),
-          socket(0)
+        : q(qq)
+        , ignoreTimer(false)
+        , socket(0)
     {}
 
     bool createSocket()
     {
         if (!FSEngineClientHandler::instance().isActive())
             return false;
-        if (socket != 0 && socket->state() == static_cast< int >(QAbstractSocket::ConnectedState))
+        if (socket != 0 && socket->state() == static_cast<int>(QAbstractSocket::ConnectedState))
             return true;
         if (socket != 0)
             delete socket;
@@ -119,8 +119,8 @@ public:
 // -- QProcessWrapper
 
 QProcessWrapper::QProcessWrapper(QObject *parent)
-    : QObject(parent),
-      d(new Private(this))
+    : QObject(parent)
+    , d(new Private(this))
 {
     connect(&d->process, SIGNAL(bytesWritten(qint64)), SIGNAL(bytesWritten(qint64)));
     connect(&d->process, SIGNAL(aboutToClose()), SIGNAL(aboutToClose()));
@@ -293,7 +293,7 @@ int QProcessWrapper::exitCode() const
     const Private::TimerBlocker blocker(this);
     if (d->createSocket())
         return callRemoteMethod<int>(d->stream, QLatin1String("QProcess::exitCode"));
-    return static_cast< int>(d->process.exitCode());
+    return static_cast<int>(d->process.exitCode());
 }
 
 QProcessWrapper::ExitStatus QProcessWrapper::exitStatus() const
@@ -301,7 +301,7 @@ QProcessWrapper::ExitStatus QProcessWrapper::exitStatus() const
     const Private::TimerBlocker blocker(this);
     if (d->createSocket())
         return callRemoteMethod<QProcessWrapper::ExitStatus>(d->stream, QLatin1String("QProcess::exitStatus"));
-    return static_cast< QProcessWrapper::ExitStatus>(d->process.exitStatus());
+    return static_cast<QProcessWrapper::ExitStatus>(d->process.exitStatus());
 }
 
 void QProcessWrapper::kill()
@@ -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);
@@ -352,7 +360,7 @@ QProcessWrapper::ProcessState QProcessWrapper::state() const
     const Private::TimerBlocker blocker(this);
     if (d->createSocket())
         return callRemoteMethod<QProcessWrapper::ProcessState>(d->stream, QLatin1String("QProcess::state"));
-    return static_cast< QProcessWrapper::ProcessState>(d->process.state());
+    return static_cast<QProcessWrapper::ProcessState>(d->process.state());
 }
 
 void QProcessWrapper::terminate()
@@ -371,7 +379,7 @@ QProcessWrapper::ProcessChannel QProcessWrapper::readChannel() const
         return callRemoteMethod<QProcessWrapper::ProcessChannel>(d->stream,
             QLatin1String("QProcess::readChannel"));
     }
-    return static_cast< QProcessWrapper::ProcessChannel>(d->process.readChannel());
+    return static_cast<QProcessWrapper::ProcessChannel>(d->process.readChannel());
 }
 
 QProcessWrapper::ProcessChannelMode QProcessWrapper::processChannelMode() const
@@ -381,7 +389,7 @@ QProcessWrapper::ProcessChannelMode QProcessWrapper::processChannelMode() const
         return callRemoteMethod<QProcessWrapper::ProcessChannelMode>(d->stream,
             QLatin1String("QProcess::processChannelMode"));
     }
-    return static_cast< QProcessWrapper::ProcessChannelMode>(d->process.processChannelMode());
+    return static_cast<QProcessWrapper::ProcessChannelMode>(d->process.processChannelMode());
 }
 
 QString QProcessWrapper::workingDirectory() const
@@ -389,7 +397,15 @@ QString QProcessWrapper::workingDirectory() const
     const Private::TimerBlocker blocker(this);
     if (d->createSocket())
         return callRemoteMethod<QString>(d->stream, QLatin1String("QProcess::workingDirectory"));
-    return static_cast< QString>(d->process.workingDirectory());
+    return static_cast<QString>(d->process.workingDirectory());
+}
+
+QString QProcessWrapper::errorString() const
+{
+    const Private::TimerBlocker blocker(this);
+    if (d->createSocket())
+        return callRemoteMethod<QString>(d->stream, QLatin1String("QProcess::errorString"));
+    return static_cast<QString>(d->process.errorString());
 }
 
 void QProcessWrapper::setEnvironment(const QStringList &param1)