diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-17 07:05:18 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-17 07:05:18 (GMT) |
| commit | dfcf988a3f0c88f96e202482e5d363d880b9d6d2 (patch) | |
| tree | 42ee9ccb99945e64956abc7d1a6f1259e10a006e /src/gui | |
| parent | 4bf2d055aa31a7d2768538368d2984a3d594650e (diff) | |
| parent | 18c0fec3afba909faa341c766f31d679892021db (diff) | |
| download | Qt-dfcf988a3f0c88f96e202482e5d363d880b9d6d2.zip Qt-dfcf988a3f0c88f96e202482e5d363d880b9d6d2.tar.gz Qt-dfcf988a3f0c88f96e202482e5d363d880b9d6d2.tar.bz2 | |
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
tests/auto/qimagereader/tst_qimagereader.cpp
tests/auto/qtwidgets/tst_qtwidgets.cpp
Diffstat (limited to 'src/gui')
| -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(); |