diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-06 23:00:13 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-06 23:00:13 (GMT) |
| commit | dd6ca88e6f8d7c3c0f38e9343dc4db409e854de6 (patch) | |
| tree | 132c399f7a57b615ca680cf2a3d28d94984a2655 /src/gui | |
| parent | 34bfad76d1afe4a0ee27496e740c8566387dc16c (diff) | |
| parent | 6af078b2a13f4855a35d48376e58154ee2d57ec1 (diff) | |
| download | Qt-dd6ca88e6f8d7c3c0f38e9343dc4db409e854de6.zip Qt-dd6ca88e6f8d7c3c0f38e9343dc4db409e854de6.tar.gz Qt-dd6ca88e6f8d7c3c0f38e9343dc4db409e854de6.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qtextcursor.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp index 769ab2f..f73cc4b 100644 --- a/src/gui/text/qtextcursor.cpp +++ b/src/gui/text/qtextcursor.cpp @@ -363,6 +363,9 @@ bool QTextCursorPrivate::movePosition(QTextCursor::MoveOperation op, QTextCursor bool adjustX = true; QTextBlock blockIt = block(); + if (!blockIt.isValid()) + return false; + if (op >= QTextCursor::Left && op <= QTextCursor::WordRight && blockIt.textDirection() == Qt::RightToLeft) { if (op == QTextCursor::Left) |