anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt 5.6 renames signal QProcesss::error()

Browse Source 
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/
This commit is contained in:
Scott Kostyshak 2016-01-24 01:33:25 -05:00
parent dc8c4f3eab
commit 20addbbf36
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/qt4/GuiCompare.cpp
View File

@ -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)));

4
src/frontends/qt4/GuiProgress.cpp
View File

@ -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 &)));

4
src/support/Systemcall.cpp
View File

@ -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)));
}