Silence a warning for unused variable in QQuickTextNode.

While refactoring it seems the position was forgotten.
As it is exposed in addTextLayout, we should try to pass
it along when initializing the selection engine.

Task-number: QTBUG-30338

Change-Id: Id8d9221efe0027315ba1d48c47c9ea2ecd8d7561
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>

diff --git a/src/quick/items/qquicktextnode.cpp b/src/quick/items/qquicktextnode.cpp
index 4952a37..d8040a1 100644 (file)
--- a/src/quick/items/qquicktextnode.cpp
+++ b/src/quick/items/qquicktextnode.cpp
@@ -176,7 +176,7 @@ void QQuickTextNode::setCursor(const QRectF &rect, const QColor &color)
     appendChildNode(m_cursorNode);
 }
 
-void QQuickTextNode::initEngine(const QColor& textColor, const QColor& selectedTextColor, const QColor& selectionColor, const QColor& anchorColor)
+void QQuickTextNode::initEngine(const QColor& textColor, const QColor& selectedTextColor, const QColor& selectionColor, const QColor& anchorColor, const QPointF &position)
 {
     m_engine.reset(new QQuickTextNodeEngine);
     m_engine->m_hasContents = false;
@@ -184,6 +184,7 @@ void QQuickTextNode::initEngine(const QColor& textColor, const QColor& selectedT
     m_engine->setSelectedTextColor(selectedTextColor);
     m_engine->setSelectionColor(selectionColor);
     m_engine->setAnchorColor(anchorColor);
+    m_engine->setPosition(position);
 }
 
 void QQuickTextNode::addImage(const QRectF &rect, const QImage &image)
@@ -249,8 +250,7 @@ void QQuickTextNode::addTextLayout(const QPointF &position, QTextLayout *textLay
                                 int selectionStart, int selectionEnd,
                                 int lineStart, int lineCount)
 {
-    Q_UNUSED(position);
-    initEngine(color, selectedTextColor, selectionColor, anchorColor);
+    initEngine(color, selectedTextColor, selectionColor, anchorColor, position);
 
 #ifndef QT_NO_IM
     int preeditLength = textLayout->preeditAreaText().length();

diff --git a/src/quick/items/qquicktextnode_p.h b/src/quick/items/qquicktextnode_p.h
index 16da3ce..2031669 100644 (file)
--- a/src/quick/items/qquicktextnode_p.h
+++ b/src/quick/items/qquicktextnode_p.h
@@ -107,8 +107,8 @@ public:
     void setUseNativeRenderer(bool on) { m_useNativeRenderer = on; }
 
 private:
-    void initEngine(const QColor &textColor, const QColor &selectedTextColor, const QColor &selectionColor, const QColor& anchorColor = QColor());
-
+    void initEngine(const QColor &textColor, const QColor &selectedTextColor, const QColor &selectionColor, const QColor& anchorColor = QColor()
+            , const QPointF &position = QPointF());
 
     QSGContext *m_context;
     QSGSimpleRectNode *m_cursorNode;