diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2012-01-26 11:19:17 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-28 14:44:48 +0100 |
| commit | 1fee3304fd45d04a2a89d88ae41e89c15e080400 (patch) | |
| tree | 141900628c6ea8c8a7bd452f69343c87bc60274c /src/corelib/kernel/qobjectdefs.h | |
| parent | 27d9fef14acdc33126004f4de3047d3344448a7d (diff) | |
Do not suppress tr() methods when QT_NO_META_MACROS is defined.
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>
Diffstat (limited to 'src/corelib/kernel/qobjectdefs.h')
| -rw-r--r-- | src/corelib/kernel/qobjectdefs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h index 38bc2008a8..c44fcd9fb6 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -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 */ |