diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-08-11 18:31:32 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-08-11 18:31:32 (GMT) |
| commit | e13a8bf193bb7583040b52dfc4a72796d77a3785 (patch) | |
| tree | c61c15f3c88d4d989f748019b0b793d88a8d489f /doc | |
| parent | 9605898c99490c9ad2b8cc1eb367d5531a18d1e3 (diff) | |
| parent | 5c4c47facfcb75b0277872a0fac813ab41700e5e (diff) | |
| download | Qt-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')
| -rw-r--r-- | doc/src/classes/qnamespace.qdoc | 1 |
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. |