diff options
| author | Jan-Arve Saether <jan-arve.saether@nokia.com> | 2011-10-21 09:10:43 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-21 10:56:24 +0200 |
| commit | 60b86257b811c3667297ab42e8eef7e0162b98a3 (patch) | |
| tree | 9ea081b1a026892694e321497b4c1334af224052 /src | |
| parent | b7950b027f8f50002a87c05368e03d568d61023f (diff) | |
Expand QT_TR_NOOP("str") to "str", not ("str").
This enables us to write code like :
QStringLiteral(QT_TR_NOOP("Press"))
or just:
QT_UNICODE_LITERAL(QT_TR_NOOP("Press"))
It also makes it consistent with the QT_TRANSLATE_NOOP3,
QT_TRANSLATE_NOOP3_UTF8 and QT_TRID_NOOP macros, as they don't surround
the string literals with parenthesis.
Change-Id: I67c30bcd88609f897bd22afb44266affa4dcfc8f
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index ee601859b7..29025d0e56 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -2437,10 +2437,10 @@ template <typename Wrapper> static inline typename Wrapper::pointer qGetPtrHelpe #define Q_D(Class) Class##Private * const d = d_func() #define Q_Q(Class) Class * const q = q_func() -#define QT_TR_NOOP(x) (x) -#define QT_TR_NOOP_UTF8(x) (x) -#define QT_TRANSLATE_NOOP(scope, x) (x) -#define QT_TRANSLATE_NOOP_UTF8(scope, x) (x) +#define QT_TR_NOOP(x) x +#define QT_TR_NOOP_UTF8(x) x +#define QT_TRANSLATE_NOOP(scope, x) x +#define QT_TRANSLATE_NOOP_UTF8(scope, x) x #define QT_TRANSLATE_NOOP3(scope, x, comment) {x, comment} #define QT_TRANSLATE_NOOP3_UTF8(scope, x, comment) {x, comment} |