Fix missing inline images

Oops, the change to support floating images caused
a regression, as it caused all images represented by object
replacement characters to be ignored instead of only the ones
that were floating and were handled elsewhere. The correct
test is less strict, only verifying that the layout position is
InFlow.

Change-Id: Ib28ea595b598bbd047eebe1a704211f0ba139382
Reviewed-on: http://codereview.qt-project.org/6074
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>

diff --git a/src/declarative/items/qsgtextnode.cpp b/src/declarative/items/qsgtextnode.cpp
index 1dd3564..f712bd7 100644 (file)
--- a/src/declarative/items/qsgtextnode.cpp
+++ b/src/declarative/items/qsgtextnode.cpp
@@ -1163,8 +1163,7 @@ void QSGTextNode::addTextDocument(const QPointF &, QTextDocument *textDocument,
                     engine.setPosition(blockPosition);
                     if (text.contains(QChar::ObjectReplacementCharacter)) {
                         QTextFrame *frame = qobject_cast<QTextFrame *>(textDocument->objectForFormat(charFormat));
-                        if (frame && frame->frameFormat().position() == QTextFrameFormat::InFlow
-                            && frame->firstPosition() <= frame->lastPosition()) {
+                        if (frame && frame->frameFormat().position() == QTextFrameFormat::InFlow) {
                             BinaryTreeNode::SelectionState selectionState =
                                     (selectionStart < textPos + text.length()
                                      && selectionEnd >= textPos)