diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-15 02:41:36 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-15 02:41:36 (GMT) |
| commit | 5645cd7d7a97edb248a67d094993900f1dba4be8 (patch) | |
| tree | b939a4e93eb1eabdff4c4c0d21d2f676d3dafb93 /src/declarative | |
| parent | 2d9bc3296168de084fab45a4008edab8c290c3ff (diff) | |
| download | Qt-5645cd7d7a97edb248a67d094993900f1dba4be8.zip Qt-5645cd7d7a97edb248a67d094993900f1dba4be8.tar.gz Qt-5645cd7d7a97edb248a67d094993900f1dba4be8.tar.bz2 | |
Make sure richtext wraps correctly with a fixed height set.
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp index b65212b..3a35dd5 100644 --- a/src/declarative/graphicsitems/qdeclarativetext.cpp +++ b/src/declarative/graphicsitems/qdeclarativetext.cpp @@ -677,7 +677,7 @@ void QDeclarativeTextPrivate::updateSize() QTextOption option((Qt::Alignment)int(hAlign | vAlign)); option.setWrapMode(QTextOption::WrapMode(wrapMode)); doc->setDefaultTextOption(option); - if (wrapMode != QDeclarativeText::NoWrap && !q->heightValid() && q->widthValid()) + if (wrapMode != QDeclarativeText::NoWrap && q->widthValid()) doc->setTextWidth(q->width()); else doc->setTextWidth(doc->idealWidth()); // ### Text does not align if width is not set (QTextDoc bug) |