X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=inline;f=plugins%2Fqmlprocess%2FProcessObject.cpp;fp=plugins%2Fqmlprocess%2FProcessObject.cpp;h=a921af985a2af5acd09dae3565cf3f203f2d6aba;hb=6a44bcee4623e71f67a53c74f166a6bc390f96fe;hp=c1dbdb31600dc30328d99e5e470d10e57eb2f1ce;hpb=b2aaae15f1f7d85835f768d566b09a24774adef8;p=quick-widgets diff --git a/plugins/qmlprocess/ProcessObject.cpp b/plugins/qmlprocess/ProcessObject.cpp index c1dbdb3..a921af9 100644 --- a/plugins/qmlprocess/ProcessObject.cpp +++ b/plugins/qmlprocess/ProcessObject.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include "ProcessObject.h" @@ -67,24 +68,25 @@ void ProcessObject::processErrored(QProcess::ProcessError error) { void ProcessObject::processFinished(int exitCode, QProcess::ExitStatus exitStatus) { + QTextCodec* codec = QTextCodec::codecForName("utf-8"); if (exitStatus == QProcess::NormalExit) { if (exitCode == 0) - { - QString out(m_process->readAllStandardOutput()); - qDebug() << "normal"; - emit completed(out.trimmed()); + { + QString out = codec->toUnicode(m_process->readAllStandardOutput()); + qDebug() << "normal"; + emit completed(out.trimmed()); } else { - QString err(m_process->readAllStandardError()); - qDebug() << "failed"; - emit failed(exitCode, err.trimmed(), m_process->error()); + QString err = codec->toUnicode(m_process->readAllStandardError()); + qDebug() << "failed"; + emit failed(exitCode, err.trimmed(), m_process->error()); } } else { - QString err(m_process->readAllStandardError()); + QString err = codec->toUnicode(m_process->readAllStandardError()); qDebug() << "failed"; emit failed(exitCode, err, m_process->error()); }