Qt 5.6 renames signal QProcesss::error()

QProcesss::error() was renamed to QProcesss::errorOccurred().

The renaming was done to avoid confusion from overloading (see the
documentation for the signal before the renaming [1]).

For more details, see this Qt bug report [2].

[1] http://doc.qt.io/qt-5/qprocess.html#error-1
[2] https://codereview.qt-project.org/#/c/114451/

diff --git a/src/frontends/qt4/GuiCompare.cpp b/src/frontends/qt4/GuiCompare.cpp
index 83ffd5ace4240800f6ec039db3778a551a496384..9a4df587d23373a99780c91382f2248451c915aa 100644 (file)
--- a/src/frontends/qt4/GuiCompare.cpp
+++ b/src/frontends/qt4/GuiCompare.cpp
@@ -310,7 +310,11 @@ int GuiCompare::run()
 
        // init the compare object and start it
        compare_ = new Compare(new_buffer_, old_buffer_, dest_buffer_, options);
+#if QT_VERSION >= 0x050600
+       connect(compare_, SIGNAL(errorOccurred()), this, SLOT(error()));
+#else
        connect(compare_, SIGNAL(error()), this, SLOT(error()));
+#endif
        connect(compare_, SIGNAL(finished(bool)), this, SLOT(finished(bool)));
        connect(compare_, SIGNAL(progress(int)), this, SLOT(progress(int)));
        connect(compare_, SIGNAL(progressMax(int)), this, SLOT(progressMax(int)));

diff --git a/src/frontends/qt4/GuiProgress.cpp b/src/frontends/qt4/GuiProgress.cpp
index a44438d4893087387079d420ea62d4cb71d9f66a..e80f250e4a34fe686f982593a310933e240b10d2 100644 (file)
--- a/src/frontends/qt4/GuiProgress.cpp
+++ b/src/frontends/qt4/GuiProgress.cpp
@@ -56,7 +56,11 @@ GuiProgress::GuiProgress()
                SLOT(doWarning(QString const &, QString const &)));
        connect(this, SIGNAL(toggleWarning(QString const &, QString const &, QString const &)),
                SLOT(doToggleWarning(QString const &, QString const &, QString const &)));
+#if QT_VERSION >= 0x050600
+       connect(this, SIGNAL(errorOccurred(QString const &, QString const &, QString const &)),
+#else
        connect(this, SIGNAL(error(QString const &, QString const &, QString const &)),
+#endif
                SLOT(doError(QString const &, QString const &, QString const &)));
        connect(this, SIGNAL(information(QString const &, QString const &)),
                SLOT(doInformation(QString const &, QString const &)));

diff --git a/src/support/Systemcall.cpp b/src/support/Systemcall.cpp
index 0e4cec7ee2e73e7f748c23b7123dc222b903ad80..a2f6a6f868631967b03390d04dbb4b7b3b4213ff 100644 (file)
--- a/src/support/Systemcall.cpp
+++ b/src/support/Systemcall.cpp
@@ -357,7 +357,11 @@ SystemcallPrivate::SystemcallPrivate(std::string const & sf,
 
        connect(process_, SIGNAL(readyReadStandardOutput()), SLOT(stdOut()));
        connect(process_, SIGNAL(readyReadStandardError()), SLOT(stdErr()));
+#if QT_VERSION >= 0x050600
+       connect(process_, SIGNAL(errorOccurred(QProcess::ProcessError)), SLOT(processError(QProcess::ProcessError)));
+#else
        connect(process_, SIGNAL(error(QProcess::ProcessError)), SLOT(processError(QProcess::ProcessError)));
+#endif
        connect(process_, SIGNAL(started()), this, SLOT(processStarted()));
        connect(process_, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(processFinished(int, QProcess::ExitStatus)));
 }