summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/fsengineserver.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/installer/fsengineserver.cpp')
-rw-r--r--src/libs/installer/fsengineserver.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/libs/installer/fsengineserver.cpp b/src/libs/installer/fsengineserver.cpp
index 991681b95..326a2a02a 100644
--- a/src/libs/installer/fsengineserver.cpp
+++ b/src/libs/installer/fsengineserver.cpp
@@ -75,7 +75,7 @@ bool startDetached(const QString &program, const QStringList &args, const QStrin
const QString arguments = QInstaller::createCommandline(program, args);
const bool success = CreateProcess(0, (wchar_t*)arguments.utf16(),
- 0, 0, FALSE, CREATE_UNICODE_ENVIRONMENT | CREATE_NEW_CONSOLE,
+ 0, 0, false, CREATE_UNICODE_ENVIRONMENT | CREATE_NEW_CONSOLE,
0, (wchar_t*)workingDirectory.utf16(),
&startupInfo, &pinfo);
@@ -129,11 +129,11 @@ class FSEngineConnectionThread : public QThread
Q_OBJECT
public:
FSEngineConnectionThread(descriptor_t socketDescriptor, QObject *parent)
- : QThread(parent),
- descriptor(socketDescriptor),
- settings(0),
- process(0),
- signalReceiver(0)
+ : QThread(parent)
+ , descriptor(socketDescriptor)
+ , settings(0)
+ , process(0)
+ , signalReceiver(0)
{}
protected:
@@ -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;
@@ -448,6 +450,8 @@ QByteArray FSEngineConnectionThread::handleCommand(const QString &command)
returnStream << process->waitForStarted(msecs);
} else if (command == QLatin1String("QProcess::workingDirectory")) {
returnStream << process->workingDirectory();
+ } else if (command == QLatin1String("QProcess::errorString")) {
+ returnStream << process->errorString();
} else if (command == QLatin1String("QProcess::write")) {
QByteArray byteArray;
receivedStream >> byteArray;