From 43e6ec9f01693044f7bc1c3954e2d6bcd70dc148 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Mon, 4 Oct 2010 14:30:09 +0200
Subject: Doc: Made documentation for Qt::TextLongestVariant public.

Reported by David Faure on #qt-labs.
---
 src/corelib/global/qnamespace.qdoc | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 5cd7f0e..b0c0e34 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -461,14 +461,17 @@
     \value TextWordWrap Breaks lines at appropriate points, e.g. at word
            boundaries.
     \value TextWrapAnywhere Breaks lines anywhere, even within words.
-    \value TextHideMnemonic Same as Qt::TextShowMnemonic but doesn't draw the underlines.
-    \value TextDontPrint Treat this text as "hidden" and don't print
-    it.
-    \value IncludeTrailingSpaces When this option is set, QTextLine::naturalTextWidth() and naturalTextRect() will
-                                 return a value that includes the width of trailing spaces in the text; otherwise
-                                 this width is excluded.
+    \value TextHideMnemonic Same as Qt::TextShowMnemonic but doesn't draw
+           the underlines.
+    \value TextDontPrint Treat this text as "hidden" and don't print it.
+    \value IncludeTrailingSpaces When this option is set,
+           QTextLine::naturalTextWidth() and naturalTextRect() will
+           return a value that includes the width of trailing spaces in the
+           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 TextBypassShaping
     \omitvalue BreakAnywhere
@@ -482,7 +485,6 @@
     \omitvalue WordBreak
     \omitvalue TextForceLeftToRight
     \omitvalue TextForceRightToLeft
-    \omitvalue TextLongestVariant Always use the longest variant when computing the size of a multi-variant string.
 
     You can use as many modifier flags as you want, except that
     Qt::TextSingleLine and Qt::TextWordWrap cannot be combined.
-- 
cgit v0.12