Skip to content
This repository has been archived by the owner on Sep 27, 2024. It is now read-only.

Commit

Permalink
Merge branch 'v0-8' into v1-0
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Preisler committed Sep 2, 2015
2 parents efe8fc2 + 8d9329f commit c700123
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/ProcessHelpers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ void SyncProcess::run()

mRunning = false;

mStdOutContents = process.readAllStandardOutput();
mStdErrContents = process.readAllStandardError();
mStdOutContents = QString::fromLocal8Bit(process.readAllStandardOutput());
mStdErrContents = QString::fromLocal8Bit(process.readAllStandardError());

// TODO: We are duplicating data here!
mDiagnosticInfo += "stdout:\n===============================\n" + QString(mStdOutContents) + QString("\n");
Expand Down

0 comments on commit c700123

Please sign in to comment.