[LyX/master] Ammend 20addbbf

[Scott Kostyshak]

commit 58730c73d4e018785e93d2a397841d27739edc56
Author: Scott Kostyshak <skost...@lyx.org>
Date:   Sun Jan 24 12:18:40 2016 -0500

    Ammend 20addbbf
    
    These two signals were not QProcess::error().

diff --git a/src/frontends/qt4/GuiCompare.cpp b/src/frontends/qt4/GuiCompare.cpp
index 9a4df58..83ffd5a 100644
--- a/src/frontends/qt4/GuiCompare.cpp
+++ b/src/frontends/qt4/GuiCompare.cpp
@@ -310,11 +310,7 @@ 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 e80f250..a44438d 100644
--- a/src/frontends/qt4/GuiProgress.cpp
+++ b/src/frontends/qt4/GuiProgress.cpp
@@ -56,11 +56,7 @@ 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 &)));