diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 19:22:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 19:22:37 (GMT) |
| commit | 2b78291003543d45d176424d6d9624d0c02c273c (patch) | |
| tree | ab21561d2ca288b7b52f8e4d3ab757b50f2ede06 /src/corelib/global | |
| parent | 50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5 (diff) | |
| parent | c7afbc97d4cb60ed11996d0bcbbddaac2b18d18c (diff) | |
| download | Qt-2b78291003543d45d176424d6d9624d0c02c273c.zip Qt-2b78291003543d45d176424d6d9624d0c02c273c.tar.gz Qt-2b78291003543d45d176424d6d9624d0c02c273c.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 6fcca04..f097f2a 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -475,9 +475,9 @@ text; otherwise this width is excluded. \value TextIncludeTrailingSpaces Same as IncludeTrailingSpaces \value TextJustificationForced Ensures that text lines are justified. - \value TextLongestVariant Ensures that the longest variant is always used - when computing the size of a multi-variant string. + \omitvalue TextLongestVariant Ensures that the longest variant is always used + when computing the size of a multi-variant string. (Internal) \omitvalue TextBypassShaping \omitvalue BreakAnywhere \omitvalue DontClip |