]> git.lyx.org Git - features.git/commitdiff
Correct the method signature of MenuTranslator::translate for Qt5
authorStephan Witt <switt@lyx.org>
Sat, 23 Aug 2014 14:01:03 +0000 (16:01 +0200)
committerStephan Witt <switt@lyx.org>
Sat, 23 Aug 2014 14:01:03 +0000 (16:01 +0200)
src/frontends/qt4/GuiApplication.cpp

index f1c2e90cc661b07dc430e8e613b54fe8251d25a4..5ee0c5883f5917a38c3fb87afbf44c4fb986c35b 100644 (file)
@@ -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")