diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2018-03-24 21:40:42 +0100 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2018-03-27 16:50:10 +0000 |
| commit | e3fa4af68ecf50c3d32e576b4b05bfefecd18c1b (patch) | |
| tree | 64b3e54e7bee5774482dadbe6a793c628a5fcf59 /src/corelib/kernel | |
| parent | acc629c1e82d19a4153bf2db821f2a34fb1e94a3 (diff) | |
qdoc: properly omit comments for enums marked with omitvalue
When a value is omitted with \omitvalue, the comment must be either
deleted or omitted with \omit .. \endomit. Otherwise the comment is
merged into the comment for the previous value
Change-Id: Ic5cfb20d36853526ae939529b4609712cd0eb341
Reviewed-by: Martin Smith <martin.smith@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 4e32f90964..e0ae350f32 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -1889,7 +1889,7 @@ bool QCoreApplication::event(QEvent *e) \value UnicodeUTF8 UTF-8. \omitvalue Latin1 - \omitvalue DefaultCodec UTF-8. + \omitvalue DefaultCodec \omit UTF-8. \endomit \omitvalue CodecForTr \sa QObject::tr(), QString::fromUtf8() diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 518381712a..ebe1813ec2 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -313,7 +313,7 @@ struct DefinedTypesFilter { \omitvalue WeakPointerToQObject \omitvalue TrackingPointerToQObject \omitvalue WasDeclaredAsMetaType - \omitvalue IsGadget This type is a Q_GADGET and it's corresponding QMetaObject can be accessed with QMetaType::metaObject Since 5.5. + \omitvalue IsGadget \omit This type is a Q_GADGET and it's corresponding QMetaObject can be accessed with QMetaType::metaObject Since 5.5. \endomit \omitvalue PointerToGadget */ |