diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-09-18 10:39:47 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-09-18 10:39:47 (GMT) |
| commit | c1db7b5d8b7fb68b12c992cfa1953a599913851c (patch) | |
| tree | d89826eb3d5ae0de3aac63f8e80f193c2baea0b2 /src/gui/painting/qpainter.cpp | |
| parent | dd3e430897a222ee9e3c7b923d094401fdeb72dd (diff) | |
| parent | 6bd75e56853acce0b9d9fcc6fc162c546d217ab0 (diff) | |
| download | Qt-c1db7b5d8b7fb68b12c992cfa1953a599913851c.zip Qt-c1db7b5d8b7fb68b12c992cfa1953a599913851c.tar.gz Qt-c1db7b5d8b7fb68b12c992cfa1953a599913851c.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/painting/qpainter.cpp')
| -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 ebaa901..ed1b5d1 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -7464,7 +7464,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(); |