From 6cbaad9398a071e6db6c2b6e577877622a4d02e4 Mon Sep 17 00:00:00 2001 From: Stephan Witt Date: Sat, 23 Aug 2014 16:01:03 +0200 Subject: [PATCH] Correct the method signature of MenuTranslator::translate for Qt5 --- src/frontends/qt4/GuiApplication.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp index f1c2e90cc6..5ee0c5883f 100644 --- a/src/frontends/qt4/GuiApplication.cpp +++ b/src/frontends/qt4/GuiApplication.cpp @@ -632,9 +632,15 @@ public: : QTranslator(parent) {} +#if QT_VERSION >= 0x050000 + virtual QString translate(const char * /* context */, + const char *sourceText, + const char * /* disambiguation */ = 0, int /* n */ = -1) const +#else QString translate(const char * /*context*/, const char * sourceText, const char * /*comment*/ = 0) const +#endif { string const s = sourceText; if (s == N_("About %1") || s == N_("Preferences")