diff options
| author | aavit <qt-info@nokia.com> | 2011-09-17 19:44:51 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-09-17 20:27:51 (GMT) |
| commit | f7a6de98e4e234833966fbe81b8ab54eba9f8429 (patch) | |
| tree | 012247296bab712fcd19b92cf1a5990fd0ed2af1 /src/corelib/global/qnamespace.qdoc | |
| parent | 8b2ee10cb1113c27d37b52dba6f7aa28d2de55b9 (diff) | |
| parent | cee22b68ed811f5b26a891d6a644613ad79aa981 (diff) | |
| download | Qt-f7a6de98e4e234833966fbe81b8ab54eba9f8429.zip Qt-f7a6de98e4e234833966fbe81b8ab54eba9f8429.tar.gz Qt-f7a6de98e4e234833966fbe81b8ab54eba9f8429.tar.bz2 | |
Merge remote branch 'qt-mainline/4.8'
Diffstat (limited to 'src/corelib/global/qnamespace.qdoc')
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 4974aef..03e0d1f 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -2560,7 +2560,7 @@ 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 + When LayoutDirectionAuto 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() |