wok annotate qt4/stuff/fix-qtbug-15857.patch @ rev 8703
add:: ndoutils
author | Eric Joseph-Alexandre <erjo@slitaz.org> |
---|---|
date | Thu Feb 17 23:12:37 2011 +0100 (2011-02-17) |
parents | |
children |
rev | line source |
---|---|
slaxemulator@8666 | 1 From 6ae84f1183e91c910ca92a55e37f8254ace805c0 Mon Sep 17 00:00:00 2001 |
slaxemulator@8666 | 2 From: Jiang Jiang <jiang.jiang@nokia.com> |
slaxemulator@8666 | 3 Date: Mon, 6 Dec 2010 13:07:36 +0100 |
slaxemulator@8666 | 4 Subject: [PATCH] Fix QTextEdit::selectAll crash from textChanged() |
slaxemulator@8666 | 5 |
slaxemulator@8666 | 6 Doing selectAll() after the entire block of text has been removed |
slaxemulator@8666 | 7 will cause this crash, because we didn't check if the block we |
slaxemulator@8666 | 8 found is valid or not. |
slaxemulator@8666 | 9 |
slaxemulator@8666 | 10 Task-number: QTBUG-15857 |
slaxemulator@8666 | 11 Reviewed-by: Eskil |
slaxemulator@8666 | 12 --- |
slaxemulator@8666 | 13 src/gui/text/qtextcursor.cpp | 3 +++ |
slaxemulator@8666 | 14 1 files changed, 3 insertions(+), 0 deletions(-) |
slaxemulator@8666 | 15 |
slaxemulator@8666 | 16 diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp |
slaxemulator@8666 | 17 index 769ab2f..f73cc4b 100644 |
slaxemulator@8666 | 18 --- a/src/gui/text/qtextcursor.cpp |
slaxemulator@8666 | 19 +++ b/src/gui/text/qtextcursor.cpp |
slaxemulator@8666 | 20 @@ -363,6 +363,9 @@ bool QTextCursorPrivate::movePosition(QTextCursor::MoveOperation op, QTextCursor |
slaxemulator@8666 | 21 bool adjustX = true; |
slaxemulator@8666 | 22 QTextBlock blockIt = block(); |
slaxemulator@8666 | 23 |
slaxemulator@8666 | 24 + if (!blockIt.isValid()) |
slaxemulator@8666 | 25 + return false; |
slaxemulator@8666 | 26 + |
slaxemulator@8666 | 27 if (op >= QTextCursor::Left && op <= QTextCursor::WordRight |
slaxemulator@8666 | 28 && blockIt.textDirection() == Qt::RightToLeft) { |
slaxemulator@8666 | 29 if (op == QTextCursor::Left) |
slaxemulator@8666 | 30 -- |
slaxemulator@8666 | 31 1.6.1 |
slaxemulator@8666 | 32 |