diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-27 15:46:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-27 15:46:58 (GMT) |
| commit | d1c26fa169196a7c597198cd971f21588dca7051 (patch) | |
| tree | 1628b3ea0b9119eb9af6fbddd68d9b820c5ce2a6 /tests/auto | |
| parent | 47ec39b4fd06247a7c30268eaffa20d5f5ddfc41 (diff) | |
| parent | f0faf4011e1128ab5e58ce3912d379481f8320cb (diff) | |
| download | Qt-d1c26fa169196a7c597198cd971f21588dca7051.zip Qt-d1c26fa169196a7c597198cd971f21588dca7051.tar.gz Qt-d1c26fa169196a7c597198cd971f21588dca7051.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Make QtQuick2 compile on QPA
Use maximum ascent/descent/leading from fallback fonts in shaping
Another ugly hack to make bidi cursor work with Core Text
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qcomplextext/tst_qcomplextext.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qcomplextext/tst_qcomplextext.cpp b/tests/auto/qcomplextext/tst_qcomplextext.cpp index 04943c5..58b31b4 100644 --- a/tests/auto/qcomplextext/tst_qcomplextext.cpp +++ b/tests/auto/qcomplextext/tst_qcomplextext.cpp @@ -214,6 +214,7 @@ void tst_QComplexText::bidiCursorMovement() QTextOption option = layout.textOption(); option.setTextDirection(basicDir == QChar::DirL ? Qt::LeftToRight : Qt::RightToLeft); layout.setTextOption(option); + layout.setCursorMoveStyle(QTextCursor::Visual); bool moved; int oldPos, newPos = 0; qreal x, newX; |