Merge branch 'kinetic-animations' of ../../qt/kinetic into kinetic-declarativeui

Conflicts:
	src/gui/graphicsview/qgraphicsitem.cpp

1 files changed, 38 insertions, 4 deletions

diff --git a/examples/statemachine/trafficlight/main.cpp b/examples/statemachine/trafficlight/main.cpp
index fbb6b68..528ed00 100644
--- a/examples/statemachine/trafficlight/main.cpp
+++ b/examples/statemachine/trafficlight/main.cpp
@@ -3,9 +3,39 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Qt Software Information (qt-info@nokia.com)
 **
-** This file is part of the $MODULE$ of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
 **
-** $TROLLTECH_DUAL_LICENSE$
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
@@ -35,6 +65,10 @@ public:
         update();
     }
 
+public slots:
+    void turnOff() { setOn(false); }
+    void turnOn() { setOn(true); }
+
 protected:
     virtual void paintEvent(QPaintEvent *)
     {
@@ -63,9 +97,9 @@ public:
         timer->setInterval(duration);
         timer->setSingleShot(true);
         QState *timing = new QState(this);
-        timing->setPropertyOnEntry(light, "on", true);
+        timing->invokeMethodOnEntry(light, "turnOn");
         timing->invokeMethodOnEntry(timer, "start");
-        timing->setPropertyOnExit(light, "on", false);
+        timing->invokeMethodOnExit(light, "turnOff");
         QFinalState *done = new QFinalState(this);
         timing->addTransition(timer, SIGNAL(timeout()), done);
         setInitialState(timing);