anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 22:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct the method signature of MenuTranslator::translate for Qt5

Browse Source
This commit is contained in:
Stephan Witt 2014-08-23 16:01:03 +02:00
parent c2d9a22639
commit 6cbaad9398
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontends/qt4/GuiApplication.cpp
View File

@ -632,9 +632,15 @@ public:
: QTranslator(parent) : 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*/, QString translate(const char * /*context*/,
const char * sourceText, const char * sourceText,
const char * /*comment*/ = 0) const const char * /*comment*/ = 0) const
#endif
{ {
string const s = sourceText; string const s = sourceText;
if (s == N_("About %1") || s == N_("Preferences") if (s == N_("About %1") || s == N_("Preferences")