diff options
| author | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-17 08:48:44 (GMT) |
|---|---|---|
| committer | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-17 08:48:44 (GMT) |
| commit | 2ec5d3977e454815a11ad0a9b6e95f77b7e17d0f (patch) | |
| tree | e66b6cfc3f477966c713f68e5156dd914a516a53 /src/gui/painting | |
| parent | 11566a349f8b9d5b6bcaf1dff64e30266a55411f (diff) | |
| parent | e7c36fc2e420f1cee4370020b9f50bb5a6dfe92a (diff) | |
| download | Qt-2ec5d3977e454815a11ad0a9b6e95f77b7e17d0f.zip Qt-2ec5d3977e454815a11ad0a9b6e95f77b7e17d0f.tar.gz Qt-2ec5d3977e454815a11ad0a9b6e95f77b7e17d0f.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index b3aef71..53d2102 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -7535,7 +7535,11 @@ void qt_format_text(const QFont &fnt, const QRectF &_r, bool hidemnmemonic = (tf & Qt::TextHideMnemonic); Qt::LayoutDirection layout_direction; - if(option) + if (tf & Qt::TextForceLeftToRight) + layout_direction = Qt::LeftToRight; + else if (tf & Qt::TextForceRightToLeft) + layout_direction = Qt::RightToLeft; + else if (option) layout_direction = option->textDirection(); else if (painter) layout_direction = painter->layoutDirection(); |