diff options
| author | Mitch Curtis <mitch.curtis@digia.com> | 2014-03-19 17:21:29 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-20 14:13:29 +0100 |
| commit | ff0e7df477ac8400c1fde8c477d721c01d949175 (patch) | |
| tree | 3abb5602b5caedd78a462293b2e429c6cff670b5 | |
| parent | 5bcb87babf3fa416375ada549108855b74be6a7b (diff) | |
Stop omitted enum value from showing up in Qt namespace doc.
The following omitted enum description can be seen at [1]:
"Ensures that the longest variant is always used when computing the
size of a multi-variant string. (Internal)"
This is because \omitvalue does not allow a description (whereas
\value does).
The description was moved to the qnamespace.h as a code comment.
[1] http://qt-project.org/doc/qt-5/qt.html#TextFlag-enum
Change-Id: I7983613bffa90f3071a4e2d678696391048c8757
Reviewed-by: Martin Smith <martin.smith@digia.com>
| -rw-r--r-- | src/corelib/global/qnamespace.h | 2 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index d7ae97e911..839d352d36 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -267,6 +267,8 @@ public: TextJustificationForced = 0x10000, TextForceLeftToRight = 0x20000, TextForceRightToLeft = 0x40000, + // Ensures that the longest variant is always used when computing the + // size of a multi-variant string. TextLongestVariant = 0x80000, TextBypassShaping = 0x100000 }; diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 31bc18749b..8ade3f86d6 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -493,8 +493,7 @@ text; otherwise this width is excluded. \value TextJustificationForced Ensures that text lines are justified. - \omitvalue TextLongestVariant Ensures that the longest variant is always used - when computing the size of a multi-variant string. (Internal) + \omitvalue TextLongestVariant \omitvalue TextBypassShaping \omitvalue TextForceLeftToRight \omitvalue TextForceRightToLeft |