diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-25 17:58:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-25 17:58:18 (GMT) |
| commit | 541f38c8860cb8a0290df2f7c3fde0c6cb87ff56 (patch) | |
| tree | 3acaf228ae58bfbec549ef79ca01c5b0311ac6b4 /src/gui/kernel | |
| parent | d9dd68c4400c3ca590ea425d6f3d070ea6094099 (diff) | |
| parent | 7c0d15a22266a425c9e9ac0120d6774e120fe01e (diff) | |
| download | Qt-541f38c8860cb8a0290df2f7c3fde0c6cb87ff56.zip Qt-541f38c8860cb8a0290df2f7c3fde0c6cb87ff56.tar.gz Qt-541f38c8860cb8a0290df2f7c3fde0c6cb87ff56.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Don't rely on mapFromGlobal in QGraphicsScenePrivate::itemsAtPosition.
Refactor blend_transformed_bilinear to simplify the blend type checking
Note RTL behavior changes in docs and changelog
Implement qt_memfill32 with Neon.
Implement the composition mode Plus with Neon.
Fix the broken unicode detection of ODBC driver.
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 3d2bfe2..ea3dcab 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -4864,6 +4864,8 @@ void QWidgetPrivate::resolveLayoutDirection() has been called for the parent do not inherit the parent's layout direction. + This method no longer affects text layout direction since Qt 4.7. + \sa QApplication::layoutDirection */ void QWidget::setLayoutDirection(Qt::LayoutDirection direction) |