diff options
| author | Ari Parkkila <ari.parkkila@qt.io> | 2022-10-03 07:58:50 +0300 |
|---|---|---|
| committer | Ari Parkkila <ari.parkkila@qt.io> | 2022-10-04 04:37:31 +0000 |
| commit | 4053446723bb71295eae94c5ddd316a56e9d4428 (patch) | |
| tree | 2a24b141b1dcbba6571d7fb40e151f5cb94ad3f2 | |
| parent | 474fa4b7aee62e704158d213d9e67eba74c69401 (diff) | |
Change obsoleted QProcess::error to errorOccurred5.15
Fixes: QTBUG-106664
Change-Id: Iee18315915b7317b76e4d241c7f8ad439d8260fa
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 3e0ecc85628f17e4d7929f3341aa76b376b8080e)
| -rw-r--r-- | process.cpp | 4 | ||||
| -rw-r--r-- | process.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/process.cpp b/process.cpp index 954cc12..4df8270 100644 --- a/process.cpp +++ b/process.cpp @@ -100,7 +100,7 @@ Process::Process() connect(mProcess, &QProcess::readyReadStandardError, this, &Process::readyReadStandardError); connect(mProcess, &QProcess::readyReadStandardOutput, this, &Process::readyReadStandardOutput); connect(mProcess, (void (QProcess::*)(int, QProcess::ExitStatus))&QProcess::finished, this, &Process::finished); - connect(mProcess, (void (QProcess::*)(QProcess::ProcessError))&QProcess::error, this, &Process::error); + connect(mProcess, (void (QProcess::*)(QProcess::ProcessError))&QProcess::errorOccurred, this, &Process::errorOccurred); if (pipe2(pipefd, O_CLOEXEC) != 0) qWarning("Could not create pipe"); @@ -172,7 +172,7 @@ void Process::setDebug() mDebug = true; } -void Process::error(QProcess::ProcessError error) +void Process::errorOccurred(QProcess::ProcessError error) { switch (error) { case QProcess::FailedToStart: @@ -64,7 +64,7 @@ private slots: void readyReadStandardError(); void readyReadStandardOutput(); void finished(int, QProcess::ExitStatus); - void error(QProcess::ProcessError); + void errorOccurred(QProcess::ProcessError); void incomingConnection(int); private: void forwardProcessOutput(qintptr fd, const QByteArray &data); |