Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: Icfa1d61fcc286c3418d4a625de11d2191336fa60

1 files changed, 5 insertions, 5 deletions

diff --git a/src/quick/items/qquickanimatedsprite_p.h b/src/quick/items/qquickanimatedsprite_p.h
index 6b49d903df..1e5981c1a4 100644
--- a/src/quick/items/qquickanimatedsprite_p.h
+++ b/src/quick/items/qquickanimatedsprite_p.h
@@ -357,19 +357,19 @@ public Q_SLOTS:
 
 private Q_SLOTS:
     void createEngine();
-    void sizeVertices();
+    void sizeVertices(QSGGeometryNode *node);
 
-protected:
+protected Q_SLOTS:
     void reset();
+
+protected:
     void componentComplete() Q_DECL_OVERRIDE;
     QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE;
 private:
     bool isCurrentFrameChangedConnected();
-    void prepareNextFrame();
+    void prepareNextFrame(QSGGeometryNode *node);
     void reloadImage();
     QSGGeometryNode* buildNode();
-    QSGGeometryNode *m_node;
-    QQuickAnimatedSpriteMaterial *m_material;
     QQuickSprite* m_sprite;
     QQuickSpriteEngine* m_spriteEngine;
     QElapsedTimer m_timestamp;