diff options
| author | Martin Smith <martin.smith@qt.io> | 2019-06-12 15:37:06 +0200 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2019-06-13 04:52:57 +0000 |
| commit | 8d2df3002b3a252686bf094566746cd31dc5d99b (patch) | |
| tree | 56dab391383bda2a47efe64aa9e056d48b50e86c /src/corelib/kernel/qobjectdefs.h | |
| parent | 762d4afdc17f96804a83391551fcc7cad26a9319 (diff) | |
doc: Fix tr() documentation issue
The declaration of tr() in the Q_OBJECT macro interferes with the
tr() declaration in the QObject class. This update fixes that bug
by resetting QT_TR_FUNCTIONS to be empty and by ensuring that the
tr() declaration in class QObject is seen by clang when qdoc is
running.
Change-Id: If55339fc417f3eee1a1e1ce3df75a18af443d630
Task-number: QTBUG-75864
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/corelib/kernel/qobjectdefs.h')
| -rw-r--r-- | src/corelib/kernel/qobjectdefs.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h index 059bb44e10..b84e87959a 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -146,6 +146,10 @@ class QString; # define QT_TR_FUNCTIONS #endif +#ifdef Q_CLANG_QDOC +#define QT_TR_FUNCTIONS +#endif + // ### Qt6: remove #define Q_OBJECT_CHECK /* empty, unused since Qt 5.2 */ |