Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv

Conflicts:
	examples/itemviews/frozencolumn/main.cpp
	src/declarative/canvas/qsimplecanvas.cpp
	src/declarative/canvas/qsimplecanvas_p.h
	src/declarative/canvas/qsimplecanvasitem.h
	src/declarative/extra/qfxparticles.cpp
	src/declarative/fx/fx.pri
	src/declarative/fx/qfxblurfilter.h
	src/declarative/fx/qfxcontentwrapper.cpp
	src/declarative/fx/qfxflickable.cpp
	src/declarative/fx/qfxfocuspanel.h
	src/declarative/fx/qfxfocusrealm.h
	src/declarative/fx/qfxhighlightfilter.cpp
	src/declarative/fx/qfxhighlightfilter.h
	src/declarative/fx/qfximage.cpp
	src/declarative/fx/qfxitem.cpp
	src/declarative/fx/qfxitem.h
	src/declarative/fx/qfxrect.cpp
	src/declarative/fx/qfxreflectionfilter.h
	src/declarative/fx/qfxshadowfilter.cpp
	src/declarative/fx/qfxshadowfilter.h
	src/declarative/fx/qfxtext.cpp
	src/declarative/fx/qfxtext.h
	src/declarative/fx/qfxtextedit.cpp
	src/declarative/opengl/glbasicshaders.h
	src/declarative/test/qfxtestengine.cpp
	src/declarative/test/qfxtestengine.h
	src/declarative/test/qfxtestobjects.cpp
	src/declarative/test/qfxtestobjects.h
	src/declarative/test/qfxtestview.h
	src/declarative/util/qfxglobal.h
	src/declarative/util/qfxview.cpp
	src/gui/graphicsview/qgraphicsitem_p.h
	tools/qmlviewer/qmlviewer.cpp

1 files changed, 44 insertions, 6 deletions

diff --git a/src/declarative/util/qmlstate_p.h b/src/declarative/util/qmlstate_p.h
index da8fdcd..414ec08 100644
--- a/src/declarative/util/qmlstate_p.h
+++ b/src/declarative/util/qmlstate_p.h
@@ -42,34 +42,72 @@
 #ifndef QMLSTATE_P_H
 #define QMLSTATE_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtDeclarative/qmlstate.h>
 #include <private/qobject_p.h>
 #include <private/qmlanimation_p.h>
+#include <private/qmltransitionmanager_p.h>
 
 QT_BEGIN_NAMESPACE
 
+class SimpleAction
+{
+public:
+    enum State { StartState, EndState };
+    SimpleAction(const Action &a, State state = StartState) 
+    {
+        property = a.property;
+        specifiedObject = a.specifiedObject;
+        specifiedProperty = a.specifiedProperty;
+        if (state == StartState) {
+            value = a.fromValue;
+            binding = property.binding();
+        } else {
+            value = a.toValue;
+            binding = a.toBinding;
+        }
+    }
+
+    QmlMetaProperty property;
+    QVariant value;
+    QmlBindableValue *binding;
+    QObject *specifiedObject;
+    QString specifiedProperty;
+};
+
 class QmlStatePrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QmlState)
 
 public:
     QmlStatePrivate()
-    : when(0), transition(0), inState(false), group(0) {}
+    : when(0), inState(false), group(0) {}
+
+    typedef QList<SimpleAction> SimpleActionList;
 
     QString name;
     QmlBindableValue *when;
     QmlConcreteList<QmlStateOperation *> operations;
-    QmlTransition *transition;
-    QmlStateOperation::RevertActionList revertList;
+
+    QmlTransitionManager transitionManager;
+
+    SimpleActionList revertList;
     QList<QmlMetaProperty> reverting;
-    QmlStateOperation::RevertActionList completeList;
-    QmlStateOperation::ActionList bindingsList;
     QString extends;
     mutable bool inState;
     QmlStateGroup *group;
 
     QmlStateOperation::ActionList generateActionList(QmlStateGroup *) const;
-    void applyBindings();
     void complete();
 };