diff options
author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-05 11:39:24 +1000 |
---|---|---|
committer | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-05 11:39:54 +1000 |
commit | 0284817d6cd7e17afa8da26ee6e9199100754446 (patch) | |
tree | c351d55d5a606c81c72e481f846b9b9e2603c883 /src/quick/scenegraph/qsgdefaultrectanglenode_p.h | |
parent | 377eb94eb19dafeca20d12bc6b624f1779fae514 (diff) | |
parent | 36bd7f616f37f5f60e59bce1f0d8970248d627de (diff) |
Merge master <-> api_changes
Change-Id: Iad2f07b989b25349fd2d4fff010e24dcd5a1688f
Diffstat (limited to 'src/quick/scenegraph/qsgdefaultrectanglenode_p.h')
-rw-r--r-- | src/quick/scenegraph/qsgdefaultrectanglenode_p.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/quick/scenegraph/qsgdefaultrectanglenode_p.h b/src/quick/scenegraph/qsgdefaultrectanglenode_p.h index 2a0aa05b90..faa2b6a43c 100644 --- a/src/quick/scenegraph/qsgdefaultrectanglenode_p.h +++ b/src/quick/scenegraph/qsgdefaultrectanglenode_p.h @@ -57,7 +57,7 @@ class QSGContext; class QSGDefaultRectangleNode : public QSGRectangleNode { public: - QSGDefaultRectangleNode(QSGContext *context); + QSGDefaultRectangleNode(); ~QSGDefaultRectangleNode(); virtual void setRect(const QRectF &rect); @@ -95,8 +95,6 @@ private: uint m_material_type : 2; // Only goes up to 3 QSGGeometry m_default_geometry; - - QSGContext *m_context; }; QT_END_NAMESPACE |