From 4037c8e9557da772664a18a953d7c05e463de938 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Tue, 7 Jan 2020 20:40:01 +0100 Subject: [PATCH] qa: Use QProcess::errorOccurred instead of QProcess::error if possible To avoid an overloaded signal name, Qt 5.6 introduced the signal QProcess::errorOccurred() to replace QProcess::error(). The latter one is deprecated since Qt 5.14, so avoid using it if possible. --- src/client/execwrapper.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/client/execwrapper.cpp b/src/client/execwrapper.cpp index f87eb0c7..b5853fe7 100644 --- a/src/client/execwrapper.cpp +++ b/src/client/execwrapper.cpp @@ -34,7 +34,11 @@ ExecWrapper::ExecWrapper(QObject* parent) connect(&_process, &QProcess::readyReadStandardOutput, this, &ExecWrapper::processReadStdout); connect(&_process, &QProcess::readyReadStandardError, this, &ExecWrapper::processReadStderr); connect(&_process, selectOverload(&QProcess::finished), this, &ExecWrapper::processFinished); +#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0) connect(&_process, selectOverload(&QProcess::error), this, &ExecWrapper::processError); +#else + connect(&_process, &QProcess::errorOccurred, this, &ExecWrapper::processError); +#endif connect(this, &ExecWrapper::output, this, &ExecWrapper::postStdout); connect(this, &ExecWrapper::error, this, &ExecWrapper::postStderr); -- 2.20.1