diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-07 16:05:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-07 16:05:55 (GMT) |
| commit | d065cc33754265a77c577fd18eee38ccf242b0c2 (patch) | |
| tree | 37e2a4c5bb20aebd906982de899f583530ec775c /src/gui/text | |
| parent | d5fc77cb77b499d4158e2e149417b34833602523 (diff) | |
| parent | 6af078b2a13f4855a35d48376e58154ee2d57ec1 (diff) | |
| download | Qt-d065cc33754265a77c577fd18eee38ccf242b0c2.zip Qt-d065cc33754265a77c577fd18eee38ccf242b0c2.tar.gz Qt-d065cc33754265a77c577fd18eee38ccf242b0c2.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/gui/text')
| -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) |