diff options
Diffstat (limited to 'src/quick/items/qquicktextnodeengine_p.h')
-rw-r--r-- | src/quick/items/qquicktextnodeengine_p.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/quick/items/qquicktextnodeengine_p.h b/src/quick/items/qquicktextnodeengine_p.h index 1fbbbc2d93..1ed98ce208 100644 --- a/src/quick/items/qquicktextnodeengine_p.h +++ b/src/quick/items/qquicktextnodeengine_p.h @@ -9,7 +9,7 @@ #include <QtGui/qtextdocument.h> #include <QtGui/qtextlayout.h> #include "qquickclipnode_p.h" -#include "qquicktextnode_p.h" +#include "qsginternaltextnode_p.h" #ifndef QQUICKTEXTNODEENGINE_P_H #define QQUICKTEXTNODEENGINE_P_H @@ -160,7 +160,7 @@ public: void mergeProcessedNodes(QList<BinaryTreeNode *> *regularNodes, QList<BinaryTreeNode *> *imageNodes); - void addToSceneGraph(QQuickTextNode *parent, + void addToSceneGraph(QSGInternalTextNode *parent, QQuickText::TextStyle style = QQuickText::Normal, const QColor &styleColor = QColor()); @@ -191,7 +191,6 @@ public: - private: struct TextDecoration { @@ -234,7 +233,7 @@ private: bool m_hasSelection : 1; bool m_hasContents : 1; - friend class QQuickTextNode; + friend class QSGInternalTextNode; }; |