diff options
| author | Martin Smith <martin.smith@qt.io> | 2018-01-03 12:11:38 +0100 |
|---|---|---|
| committer | Martin Smith <martin.smith@qt.io> | 2018-01-08 19:10:50 +0000 |
| commit | 0fd0059a1328723199641ced96f0c4b98e44e9d9 (patch) | |
| tree | 2a461cae1d85571e8af0dd452a792a6ee8d6219c /src/corelib/kernel/qobjectdefs.h | |
| parent | beeb748b2ce1d4aab60213778e9342ad330e1e07 (diff) | |
doc: Correct qdoc warnings in qobject.cpp and qmetatype.cpp
clang required adding template clauses to a few \fn commands.
There were also a few cases where Q_QDOC was changed to Q_CLANG_QDOC
and a few cases where special declarations for qdoc were removed in
favor of the actual declarations.
Unfortunately, a few qdoc warnings remain unfixed for classes
QObject and QMetaType, but these might be caused by minor bugs
in clang-qdoc itself, so they will be fixed there.
Change-Id: Ib586628cb6d2aa9cf4bcad303b5af09b412a7e57
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
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 7d2cc4dcbc..bc77c136e3 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -349,7 +349,7 @@ struct Q_CORE_EXPORT QMetaObject QObject *cast(QObject *obj) const; const QObject *cast(const QObject *obj) const; -#ifndef QT_NO_TRANSLATION +#if !defined(QT_NO_TRANSLATION) || defined(Q_CLANG_QDOC) QString tr(const char *s, const char *c, int n = -1) const; #endif // QT_NO_TRANSLATION |