summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2010-12-07 16:54:25 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2010-12-07 16:54:25 (GMT)
commit3fd25eb88791bc7c1be1341a1b1bcd1d9710521d (patch)
tree267b0a9f1a0a9c679b36ccf1b44b6a03bfa4b066 /src/gui
parent90928a986d8f37cf394d45cbcf12aaeeaa62d565 (diff)
parentdd6ca88e6f8d7c3c0f38e9343dc4db409e854de6 (diff)
downloadQt-3fd25eb88791bc7c1be1341a1b1bcd1d9710521d.zip
Qt-3fd25eb88791bc7c1be1341a1b1bcd1d9710521d.tar.gz
Qt-3fd25eb88791bc7c1be1341a1b1bcd1d9710521d.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/text/qtextcursor.cpp3
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)