summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qnamespace.qdoc
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2010-06-05 19:10:08 (GMT)
committerLars Knoll <lars.knoll@nokia.com>2010-06-09 22:07:15 (GMT)
commit0b06274858cab9cedace8e684d16664e49d5f814 (patch)
treead27f1c25495fba9d4469ad545cf7ce4de12e533 /src/corelib/global/qnamespace.qdoc
parent17427887a2847acc74c61424e812aca0fea23226 (diff)
downloadQt-0b06274858cab9cedace8e684d16664e49d5f814.zip
Qt-0b06274858cab9cedace8e684d16664e49d5f814.tar.gz
Qt-0b06274858cab9cedace8e684d16664e49d5f814.tar.bz2
Introduce LayoutDirection Qt::LayoutDirectionAuto
Extend the enum to contains a value that can be used to hint that we would like to determine the text direction from the content. Reviewed-by: Simon Hausmann
Diffstat (limited to 'src/corelib/global/qnamespace.qdoc')
-rw-r--r--src/corelib/global/qnamespace.qdoc12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 7eae3a5..abbc03e 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -2572,15 +2572,23 @@
/*!
\enum Qt::LayoutDirection
- Specifies the direction of Qt's layouts:
+ Specifies the direction of Qt's layouts and text handling.
\value LeftToRight Left-to-right layout.
\value RightToLeft Right-to-left layout.
+ \value LayoutDirectionAuto Automatic layout.
Right-to-left layouts are necessary for certain languages,
notably Arabic and Hebrew.
- \sa QApplication::setLayoutDirection(), QWidget::setLayoutDirection()
+ LayoutDirectionAuto serves two purposes. When used in conjunction with widgets and layouts, it
+ will imply to use the layout direction set on the parent widget or QApplication. This
+ has the same effect as QWidget::unsetLayoutDirection().
+
+ When LayoutDirectoinAuto is used in conjunction with text layouting, it will imply that the text
+ directionality is determined from the content of the string to be layouted.
+
+ \sa QApplication::setLayoutDirection(), QWidget::setLayoutDirection(), QTextOption::setTextDirection(), QString::isRightToLeft()
*/
/*!