diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-13 08:10:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-13 08:10:19 (GMT) |
| commit | 5514d98d412022311f42de50719da242aaa71490 (patch) | |
| tree | ee09839c6ce95645da511c5ebd91d19586649976 /src/corelib/global/qnamespace.qdoc | |
| parent | caf1f6830efdd868b9bda588421e1b046125f409 (diff) | |
| parent | a3a5566678256a029893fdfbc0c977e68bb61f2e (diff) | |
| download | Qt-5514d98d412022311f42de50719da242aaa71490.zip Qt-5514d98d412022311f42de50719da242aaa71490.tar.gz Qt-5514d98d412022311f42de50719da242aaa71490.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (213 commits)
Doc updates to Qt for Symbian installation instructions and platform notes.
Doc updates to platform notes document.
Fix accessible menu not returning child name.
Fix broken qglthreads autotest build on Solaris.
Doc updates to platform notes of Qt 4.8 doc.
Disabled activeqt/webbrowser example from mingw build.
Don't store the alignment attribute for spacers
Doc updates to Qt 4.8 platform notes documentation.
Update changelog for Qt-4.8.0: add QtWebKit notes
Update changelog for Qt 4.8
Fix broken Solaris build (getpwnam_r usage)
Improve sbsv2 whatlog support.
Sentences should end with a period! (Poor man's rebuild trigger.)
Update changes-4.8.0 file
Modified SymSQL documentation in sql-driver.qdoc according review comments
Added correct licence headers to symsql source files
Documentation modifications for SymbianSQL added into sql-driver.qdoc
Release Symbian SQL driver
Fixed a typo found by static checker
Added SQL driver plugin implementation for Symbian.
...
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() |