Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: I6033aba359ac551f450ad517d20a0986bf4655f6

1 files changed, 29 insertions, 0 deletions

diff --git a/src/quick/items/qquicktextnodeengine_p.h b/src/quick/items/qquicktextnodeengine_p.h
index 3441a5a973..178454b19e 100644
--- a/src/quick/items/qquicktextnodeengine_p.h
+++ b/src/quick/items/qquicktextnodeengine_p.h
@@ -102,6 +102,33 @@ public:
         static void inOrder(const QVarLengthArray<BinaryTreeNode, 16> &binaryTree, QVarLengthArray<int> *sortedIndexes, int currentIndex = 0);
     };
 
+    struct BinaryTreeNodeKey
+    {
+        BinaryTreeNodeKey(QFontEngine *fe,
+                          QQuickDefaultClipNode *cn,
+                          QRgb col,
+                          int selState)
+            : fontEngine(fe)
+            , clipNode(cn)
+            , color(col)
+            , selectionState(selState)
+        {
+        }
+
+        bool operator==(const BinaryTreeNodeKey &otherKey) const
+        {
+            return fontEngine == otherKey.fontEngine
+                    && clipNode == otherKey.clipNode
+                    && color == otherKey.color
+                    && selectionState == otherKey.selectionState;
+        }
+
+        QFontEngine *fontEngine;
+        QQuickDefaultClipNode *clipNode;
+        QRgb color;
+        int selectionState;
+    };
+
     QQuickTextNodeEngine() : m_hasSelection(false), m_hasContents(false) {}
 
     bool hasContents() const { return m_hasContents; }
@@ -141,6 +168,8 @@ public:
                             int start, int end,
                             int selectionStart, int selectionEnd);
 
+    void mergeProcessedNodes(QList<BinaryTreeNode *> *regularNodes,
+                             QList<BinaryTreeNode *> *imageNodes);
     void addToSceneGraph(QQuickTextNode *parent,
                          QQuickText::TextStyle style = QQuickText::Normal,
                          const QColor &styleColor = QColor());