summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-04-27 06:42:09 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-04-27 06:42:09 (GMT)
commitba97ea29d33acf9ab421f4d8ef5202ec83231d7e (patch)
treed06cc4b362eebe84e799ec51aead23e433dd7eea
parentdb51f7d5452f645db252341d8a633a299b2ef2e1 (diff)
downloadQt-ba97ea29d33acf9ab421f4d8ef5202ec83231d7e.zip
Qt-ba97ea29d33acf9ab421f4d8ef5202ec83231d7e.tar.gz
Qt-ba97ea29d33acf9ab421f4d8ef5202ec83231d7e.tar.bz2
Ensure text document is created before we access it.
-rw-r--r--src/declarative/graphicsitems/qdeclarativetext.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index 0b59503..2b8da8e 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -717,6 +717,7 @@ void QDeclarativeTextPrivate::updateSize()
dy -= size.height();
} else {
singleline = false; // richtext can't elide or be optimized for single-line case
+ ensureDoc();
doc->setDefaultFont(font);
QTextOption option((Qt::Alignment)int(hAlign | vAlign));
option.setWrapMode(QTextOption::WrapMode(wrapMode));