diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-18 14:39:46 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-18 14:39:46 (GMT) |
| commit | e2a6bf8d1c69d86c939aafcf357d60dcaa5f3d42 (patch) | |
| tree | a121e872fd29a1820300b11a0261bf4ac78482e9 /src/gui/kernel | |
| parent | 7b41d3937c4521ba74b421da26d3a61a7aa4aa6e (diff) | |
| parent | cb5e66d1d43c0cf452aff0e437a2ea9011c6b659 (diff) | |
| download | Qt-e2a6bf8d1c69d86c939aafcf357d60dcaa5f3d42.zip Qt-e2a6bf8d1c69d86c939aafcf357d60dcaa5f3d42.tar.gz Qt-e2a6bf8d1c69d86c939aafcf357d60dcaa5f3d42.tar.bz2 | |
Merge remote branch 'staging/4.6' into 4.6
Conflicts:
configure.exe
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 4840d65..709f6f3 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -4677,8 +4677,10 @@ void QWidgetPrivate::resolveLayoutDirection() By default, this property is set to Qt::LeftToRight. When the layout direction is set on a widget, it will propagate to - the widget's children. Children added after the call to \c - setLayoutDirection() will not inherit the parent's layout + the widget's children, but not to a child that is a window and not + to a child for which setLayoutDirection() has been explicitly + called. Also, child widgets added \e after setLayoutDirection() + has been called for the parent do not inherit the parent's layout direction. \sa QApplication::layoutDirection |