diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2018-08-25 17:34:50 +0200 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2018-08-25 21:12:30 +0200 |
| commit | 1eca75daeabd163211f76bb462582c11e688b670 (patch) | |
| tree | 6edf1ccc45cdc0aa803d69cbb533ba5c11e074c3 | |
| parent | 9c2c6463eb9cc27ba1deaebbe47a02e68b5ecbc1 (diff) | |
Use || instead of "or".
No idea why "or" would work at all, but definitely
fails to compile on MSVC.
| -rw-r--r-- | src/executor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/executor.cpp b/src/executor.cpp index 64abb664..c0b95505 100644 --- a/src/executor.cpp +++ b/src/executor.cpp @@ -198,7 +198,7 @@ void Executor::finished(int exitCode, QProcess::ExitStatus exitStatus) { QTextCodec *codec = QTextCodec::codecForLocale(); if (i.readStdout) output = codec->toUnicode(m_process.readAllStandardOutput()); - if (i.readStderr or exitCode != 0) { + if (i.readStderr || exitCode != 0) { err = codec->toUnicode(m_process.readAllStandardError()); if (exitCode != 0) dbg() << exitCode << err; |