From 7224b30171f10ee659014af0c340ad43782fe22b Mon Sep 17 00:00:00 2001
From: Andrew den Exter <andrew.den-exter@nokia.com>
Date: Fri, 27 Apr 2012 09:51:01 +1000
Subject: Fix crash in TextEdit when changing text content.

Verify the text cursor is not before attempting to deference the
layout it refers to.

Task-number: QTBUG-25389
Change-Id: I8a75393c5af9f81821ad91cbfdd7bbca0d84b1a2
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
---
 src/declarative/graphicsitems/qdeclarativetextedit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index c23718b..7482669 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -547,7 +547,7 @@ bool QDeclarativeTextEditPrivate::determineHorizontalAlignment()
     Q_Q(QDeclarativeTextEdit);
     if (hAlignImplicit && q->isComponentComplete()) {
         bool alignToRight;
-        if (text.isEmpty()) {
+        if (text.isEmpty() && !control->textCursor().isNull()) {
             const QString preeditText = control->textCursor().block().layout()->preeditAreaText();
             alignToRight = preeditText.isEmpty()
                     ? QApplication::keyboardInputDirection() == Qt::RightToLeft
-- 
cgit v0.12