Fix floating images in QSGTextNode
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Wed, 5 Oct 2011 10:13:31 +0000 (12:13 +0200)
committerQt by Nokia <qt-info@nokia.com>
Wed, 5 Oct 2011 12:31:40 +0000 (14:31 +0200)
commit2dbb77584a26b8de5f84124498059d9f811a23dd
treef5bf7edfbb9289f69e22703b698c7d6947146bd6
parentcd8c7b1c3c4f743bda9b66ef7840606a20e7b9cf
Fix floating images in QSGTextNode

When images are floating and we encounter the object replacement
character, we should ignore them, as they're done by special
handling of the QTextFrame. We also need to make sure they are
not attempted inlined by passing the layout position of the frame
to addTextObject(), and we need to set a valid QTextLine for the
object to make sure it's added to the graph.

Change-Id: Ia43ef3fd4bb9c7b48e0862071118ee0f176212bd
Reviewed-on: http://codereview.qt-project.org/6036
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
src/declarative/items/qsgtextnode.cpp