diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-01-19 07:54:46 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-01-19 07:54:46 (GMT) |
| commit | 630114a8c65e492b7b9008e056895302865ba528 (patch) | |
| tree | 50bb56cd3d5cd45626bb2d9a40c7cf21f14a4a20 /src/declarative/graphicsitems/qmlgraphicstext.cpp | |
| parent | 98a8be614d410a153cd9c314465f4c49d4ad096d (diff) | |
| parent | 8eb1bf3ea506ec1f9636cab684695b91d846a3cd (diff) | |
| download | Qt-630114a8c65e492b7b9008e056895302865ba528.zip Qt-630114a8c65e492b7b9008e056895302865ba528.tar.gz Qt-630114a8c65e492b7b9008e056895302865ba528.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/graphicsitems/qmlgraphicstext.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicstext.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicstext.cpp b/src/declarative/graphicsitems/qmlgraphicstext.cpp index 84f925d..bfb928a 100644 --- a/src/declarative/graphicsitems/qmlgraphicstext.cpp +++ b/src/declarative/graphicsitems/qmlgraphicstext.cpp @@ -368,7 +368,7 @@ void QmlGraphicsText::setWrap(bool w) will automatically determine whether the text should be treated as rich text. This determination is made using Qt::mightBeRichText(). - StyledText is an optimized format able supporting some basic text + StyledText is an optimized format supporting some basic text styling markup, in the style of html 3.2: \code @@ -379,6 +379,8 @@ void QmlGraphicsText::setWrap(bool w) > < & \endcode + \c StyledText parser is strict, requiring tags to be correctly nested. + \table \row \o |