Fix shadowing and rvalue warnings

The tests attempt to initialize the struct members directly is invalid
in any case. The static create() functions are mandatory since new members
may be added (via the reserved bits) at any time.

Also expand the Attribute struct spec to keep VS2012 happy (this can be
reverted later once it's gone from CI).

Change-Id: Ibec1fdb8e2787c3665ec397b6adb906210d570e4
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/quick/scenegraph/coreapi/qsgnode.h b/src/quick/scenegraph/coreapi/qsgnode.h
index 144f42da1c..74480aaca7 100644
--- a/src/quick/scenegraph/coreapi/qsgnode.h
+++ b/src/quick/scenegraph/coreapi/qsgnode.h
@@ -204,8 +204,8 @@ public:
     const QMatrix4x4 *matrix() const { return m_matrix; }
     const QSGClipNode *clipList() const { return m_clip_list; }
 
-    void setMatrix(const QMatrix4x4 *matrix) { m_matrix = matrix; }
-    void setClipList(const QSGClipNode *clipList) { m_clip_list = clipList; }
+    void setMatrix(const QMatrix4x4 *m) { m_matrix = m; }
+    void setClipList(const QSGClipNode *c) { m_clip_list = c; }
 
 protected:
     QSGBasicGeometryNode(NodeType type);