Merge remote-tracking branch 'origin/master' into api_changes

Conflicts:
	tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp

Change-Id: I884afc3b6d65c6411733a897a1949e19393573a7

1 files changed, 3 insertions, 6 deletions

diff --git a/examples/animation/stickman/animation.cpp b/examples/animation/stickman/animation.cpp
index 4469b365de..afdfae6eca 100644
--- a/examples/animation/stickman/animation.cpp
+++ b/examples/animation/stickman/animation.cpp
@@ -41,6 +41,7 @@
 #include "animation.h"
 
 #include <QPointF>
+#include <QVector>
 #include <QIODevice>
 #include <QDataStream>
 
@@ -57,11 +58,7 @@ public:
 
     void setNodeCount(int nodeCount)
     {
-        while (nodeCount > m_nodePositions.size())
-            m_nodePositions.append(QPointF());            
-        
-        while (nodeCount < m_nodePositions.size())
-            m_nodePositions.removeLast();
+        m_nodePositions.resize(nodeCount);
     }
 
     QPointF nodePos(int idx) const
@@ -75,7 +72,7 @@ public:
     }
     
 private:
-    QList<QPointF> m_nodePositions;
+    QVector<QPointF> m_nodePositions;
 };
 
 Animation::Animation()