diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index cb7f21512ef..4799e8adbd0 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -1761,12 +1761,6 @@ void Process::setStdOutCodec(QTextCodec *c) d->m_stdOutCodec = c; } -void Process::setStdErrCodec(QTextCodec *c) -{ - QTC_ASSERT(c, return); - d->m_stdErrCodec = c; -} - void Process::setTimeOutMessageBoxEnabled(bool v) { d->m_timeOutMessageBoxEnabled = v; diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h index 1de06a359b4..bf79f774c88 100644 --- a/src/libs/utils/qtcprocess.h +++ b/src/libs/utils/qtcprocess.h @@ -144,8 +144,7 @@ public: EventLoopMode eventLoopMode = EventLoopMode::Off); void setCodec(QTextCodec *c); // for stdOut and stdErr - void setStdOutCodec(QTextCodec *c); - void setStdErrCodec(QTextCodec *c); + void setStdOutCodec(QTextCodec *c); // for stdOut, stdErr uses executable.processStdErrCodec() void setTimeOutMessageBoxEnabled(bool); diff --git a/src/plugins/coreplugin/locator/executefilter.cpp b/src/plugins/coreplugin/locator/executefilter.cpp index 863ed8834dd..cada4a6d45d 100644 --- a/src/plugins/coreplugin/locator/executefilter.cpp +++ b/src/plugins/coreplugin/locator/executefilter.cpp @@ -17,7 +17,6 @@ #include #include #include -#include using namespace Tasking; using namespace Utils; @@ -160,7 +159,6 @@ void ExecuteFilter::createProcess() m_process = new Process; m_process->setEnvironment(Environment::systemEnvironment()); - m_process->setCodec(QTextCodec::codecForLocale()); connect(m_process, &Process::done, this, &ExecuteFilter::done); connect(m_process, &Process::readyReadStandardOutput, this, &ExecuteFilter::readStdOutput); connect(m_process, &Process::readyReadStandardError, this, &ExecuteFilter::readStdError); diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp index 4f3dc2ffba0..765b4eb877a 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.cpp +++ b/src/plugins/projectexplorer/abstractprocessstep.cpp @@ -194,9 +194,8 @@ bool AbstractProcessStep::setupProcess(Process &process) if (d->m_lowPriority && projectExplorerSettings().lowBuildPriority) process.setLowPriority(); - process.setStdOutCodec(buildEnvironment().hasKey("VSLANG") - ? QTextCodec::codecForName("UTF-8") : QTextCodec::codecForLocale()); - process.setStdErrCodec(QTextCodec::codecForLocale()); + if (buildEnvironment().hasKey("VSLANG")) + process.setStdOutCodec(QTextCodec::codecForName("UTF-8")); process.setStdOutCallback([this](const QString &s){ emit addOutput(s, OutputFormat::Stdout, DontAppendNewline); diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp index 37cb75df065..25eb72ca905 100644 --- a/src/plugins/remotelinux/genericdirectuploadstep.cpp +++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp @@ -137,7 +137,6 @@ GroupItem GenericDirectUploadStep::statTask(UploadStorage *storage, StatEndHandler statEndHandler) { const auto onSetup = [this, file](Process &process) { - process.setCodec(QTextCodec::codecForName("UTF-8")); // We'd like to use --format=%Y, but it's not supported by busybox. process.setCommand({deviceConfiguration()->filePath("stat"), {"-t", Utils::ProcessArgs::quoteArgUnix(file.remoteFilePath())}});