summaryrefslogtreecommitdiffstats
path: root/doc/src/classes
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-08-11 18:31:32 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-08-11 18:31:32 (GMT)
commite13a8bf193bb7583040b52dfc4a72796d77a3785 (patch)
treec61c15f3c88d4d989f748019b0b793d88a8d489f /doc/src/classes
parent9605898c99490c9ad2b8cc1eb367d5531a18d1e3 (diff)
parent5c4c47facfcb75b0277872a0fac813ab41700e5e (diff)
downloadQt-e13a8bf193bb7583040b52dfc4a72796d77a3785.zip
Qt-e13a8bf193bb7583040b52dfc4a72796d77a3785.tar.gz
Qt-e13a8bf193bb7583040b52dfc4a72796d77a3785.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'doc/src/classes')
-rw-r--r--doc/src/classes/qnamespace.qdoc1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/src/classes/qnamespace.qdoc b/doc/src/classes/qnamespace.qdoc
index 18ecd7b..5872d04 100644
--- a/doc/src/classes/qnamespace.qdoc
+++ b/doc/src/classes/qnamespace.qdoc
@@ -490,6 +490,7 @@
\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.