diff options
| author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-10-17 14:53:33 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-30 08:29:49 +0100 |
| commit | 906d5c5c40183468f9521277c6244a6c46730de6 (patch) | |
| tree | 0eb46a8f88d59993ab659e2dc07970d1ce2f0d73 /src/quick/items/qquicktextnode_p.h | |
| parent | c084d32d92b2df55532fa1599e590c29bf2b5bfb (diff) | |
| download | qtdeclarative-906d5c5c40183468f9521277c6244a6c46730de6.tar.gz | |
Use one render loop per QQuickWindow
See the task for the full reasoning behind this patch.
The threaded renderloop has been refactored to have one window per
thread. This is mostly a simplification of the current code path where
for loops over multiple windows are turned into if (window).
The QSGContext has been split into two classes, QSGRenderContext
for which there is one per OpenGLContext.
The rest of the patch is name changes and a couple of cleanups
in the hopes of simplifying this change.
Task-number: QTBUG-33993
Change-Id: I31c81f9694d7da7474a72333169be38de62613c4
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick/items/qquicktextnode_p.h')
| -rw-r--r-- | src/quick/items/qquicktextnode_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/quick/items/qquicktextnode_p.h b/src/quick/items/qquicktextnode_p.h index 64f396eb10..0bff0d5cff 100644 --- a/src/quick/items/qquicktextnode_p.h +++ b/src/quick/items/qquicktextnode_p.h @@ -77,7 +77,7 @@ public: }; Q_DECLARE_FLAGS(Decorations, Decoration) - QQuickTextNode(QSGContext *, QQuickItem *ownerElement); + QQuickTextNode(QQuickItem *ownerElement); ~QQuickTextNode(); static bool isComplexRichText(QTextDocument *); @@ -110,7 +110,6 @@ private: 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; QList<QSGTexture *> m_textures; QQuickItem *m_ownerElement; |