diff options
author | hjk <hjk@qt.io> | 2017-07-13 17:59:53 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2017-07-14 09:27:58 +0000 |
commit | 6a4499205067732d5dadc626eb6af8b1f783b919 (patch) | |
tree | 1ba5dea7c99ee1c7cfc5dfb3b8b2abe26dd9da5a /src/plugins/projectexplorer/applicationlauncher.cpp | |
parent | 77e32885a76bf7b0dd1821b0c591058bfd0df635 (diff) |
Make ApplicationLauncher report QStrings, not QByteArray
Realistically, we only have UTF-8/plain ASCII messages, and if not then
the conversion should happen when the message enters the "creator eco
system" as there's potentially information on the actual encoding
present, not at some random consumer further down the chain.
Change-Id: Ie21199b99255f5c4d28fce3da7db2fd6c3bcfb3a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/applicationlauncher.cpp')
-rw-r--r-- | src/plugins/projectexplorer/applicationlauncher.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/applicationlauncher.cpp b/src/plugins/projectexplorer/applicationlauncher.cpp index 50cdea972b..1dcb209250 100644 --- a/src/plugins/projectexplorer/applicationlauncher.cpp +++ b/src/plugins/projectexplorer/applicationlauncher.cpp @@ -459,13 +459,15 @@ void ApplicationLauncherPrivate::handleApplicationFinished() void ApplicationLauncherPrivate::handleRemoteStdout() { QTC_ASSERT(m_state == Run, return); - emit q->remoteStdout(m_deviceProcess->readAllStandardOutput()); + const QByteArray output = m_deviceProcess->readAllStandardOutput(); + emit q->remoteStdout(QString::fromUtf8(output)); } void ApplicationLauncherPrivate::handleRemoteStderr() { QTC_ASSERT(m_state == Run, return); - emit q->remoteStderr(m_deviceProcess->readAllStandardError()); + const QByteArray output = m_deviceProcess->readAllStandardError(); + emit q->remoteStderr(QString::fromUtf8(output)); } void ApplicationLauncherPrivate::doReportError(const QString &message) |