Merge pull request #1873 from openscad/qt5-compile-fix

Handle 2 argument translation calls generated by Qt 5.7.1 (fixes #1872).
This commit is contained in:
Marius Kintel 2016-12-20 20:27:19 -05:00 committed by GitHub
commit 5aff07ddd4

View file

@ -16,10 +16,16 @@
#define N_(String) String
inline QString _( const char *msgid, int category )
inline QString _(const char *msgid, int category)
{
Q_UNUSED( category );
return QString::fromUtf8( _( msgid ) );
Q_UNUSED(category);
return QString::fromUtf8(_(msgid));
}
inline QString _(const char *msgid, const char *disambiguation)
{
Q_UNUSED(disambiguation);
return QString::fromUtf8(_(msgid));
}
#endif