Merge commit 'qt/master' into kinetic-graphicseffect

Conflicts:
	src/gui/graphicsview/graphicsview.pri
	src/gui/graphicsview/qgraphicsitem.cpp
	src/gui/graphicsview/qgraphicsitem.h
	src/gui/graphicsview/qgraphicsitem_p.h
	src/gui/graphicsview/qgraphicsscene.cpp
	tests/auto/auto.pro

1 files changed, 4 insertions, 2 deletions

diff --git a/examples/animation/stickman/lifecycle.cpp b/examples/animation/stickman/lifecycle.cpp
index c761d87..700916d 100644
--- a/examples/animation/stickman/lifecycle.cpp
+++ b/examples/animation/stickman/lifecycle.cpp
@@ -56,8 +56,9 @@ public:
     {
     }
     KeyPressTransition(GraphicsView *receiver, Qt::Key key, QAbstractState *target)
-        : QSignalTransition(receiver, SIGNAL(keyPressed(int)), QList<QAbstractState*>() << target), m_key(key)
+        : QSignalTransition(receiver, SIGNAL(keyPressed(int))), m_key(key)
     {
+        setTargetState(target);
     }
 
     virtual bool eventTest(QEvent *e)
@@ -78,8 +79,9 @@ class LightningStrikesTransition: public QEventTransition
 {
 public:
     LightningStrikesTransition(QAbstractState *target)
-        : QEventTransition(this, QEvent::Timer, QList<QAbstractState*>() << target)
+        : QEventTransition(this, QEvent::Timer)
     {
+        setTargetState(target);
         qsrand((uint)QDateTime::currentDateTime().toTime_t());
         startTimer(1000);
     }