AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not suppress tr() methods when QT_NO_META_MACROS is defined.

Browse Source 
The tr() methods are unrelated to the "meta" part, so disabling them
with that macro is not the proper way. They were originally included to
make static checks for string translation simpler, but it just results
in duplicating the definition every time QT_NO_META_MACROS is used.

Change-Id: I29eb9b83a09e1fd6c66c85c9e4ff23d8dbe65f15
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Erik Verbruggen 2012-01-26 11:19:17 +01:00 committed by Qt by Nokia
parent 27d9fef14a
commit 1fee3304fd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qobjectdefs.h
View File

@ -87,6 +87,7 @@ class QString;
#define Q_INVOKABLE
#define Q_SIGNAL
#define Q_SLOT
#endif // QT_NO_META_MACROS
#ifndef QT_NO_TRANSLATION
# ifndef QT_NO_TEXTCODEC
@ -106,7 +107,6 @@ class QString;
// inherit the ones from QObject
# define QT_TR_FUNCTIONS
#endif
#endif // QT_NO_META_MACROS
#if defined(QT_NO_QOBJECT_CHECK)
/* tmake ignore Q_OBJECT */