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

5 files changed, 21 insertions, 27 deletions

diff --git a/tests/auto/declarative/visual/bindinganimation/bindinganimation.qml b/tests/auto/declarative/visual/bindinganimation/bindinganimation.qml
index 61cedc2..69c5d81 100644
--- a/tests/auto/declarative/visual/bindinganimation/bindinganimation.qml
+++ b/tests/auto/declarative/visual/bindinganimation/bindinganimation.qml
@@ -13,21 +13,19 @@ Rect {
     states: [
         State {
             name: "hello"
-            SetProperty {
+            SetProperties {
                 target: MyRect
-                property: "x"
-                binding: 100
+                x: 100
             }
-            SetProperty {
+            SetProperties {
                 target: MyMouseRegion
-                property: "onClicked"
-                value: "Page.currentState = ''"
+                onClicked: "Page.currentState = ''"
             }
         }
     ]
     transitions: [
         Transition {
-            NumericAnimation {
+            NumberAnimation {
                 properties: "x"
             }
         }
diff --git a/tests/auto/declarative/visual/colorAnimation/colorAnimation.qml b/tests/auto/declarative/visual/colorAnimation/colorAnimation.qml
index d351b8c..cb631d4 100644
--- a/tests/auto/declarative/visual/colorAnimation/colorAnimation.qml
+++ b/tests/auto/declarative/visual/colorAnimation/colorAnimation.qml
@@ -5,18 +5,16 @@ Rect {
     states: [
         State {
             name: "first"
-            SetProperty {
+            SetProperties {
                 target: mainrect
-                property: "color"
-                value: "red"
+                color: "red"
             }
         },
         State {
             name: "second"
-            SetProperty {
+            SetProperties {
                 target: mainrect
-                property: "color"
-                value: "blue"
+                color: "blue"
             }
         }
     ]
diff --git a/tests/auto/declarative/visual/easing/easing.qml b/tests/auto/declarative/visual/easing/easing.qml
index 4a0ed14..7a58276 100644
--- a/tests/auto/declarative/visual/easing/easing.qml
+++ b/tests/auto/declarative/visual/easing/easing.qml
@@ -148,19 +148,17 @@ Rect {
                         State {
                             name: "from"
                             when: !mouse.pressed
-                            SetProperty {
+                            SetProperties {
                                 target: text
-                                property: "x"
-                                value: 0
+                                x: 0
                             }
                         },
                         State {
                             name: "to"
                             when: mouse.pressed
-                            SetProperty {
+                            SetProperties {
                                 target: text
-                                property: "x"
-                                value: item.width-100
+                                x: item.width-100
                             }
                         }
                     ]
@@ -169,7 +167,7 @@ Rect {
                             fromState: "*"
                             toState: "to"
                             reversible: true
-                            NumericAnimation {
+                            NumberAnimation {
                                 properties: "x"
                                 easing: type
                             }
diff --git a/tests/auto/declarative/visual/flipable/flipable.xml b/tests/auto/declarative/visual/flipable/flipable.xml
index d769e55..9288acc 100644
--- a/tests/auto/declarative/visual/flipable/flipable.xml
+++ b/tests/auto/declarative/visual/flipable/flipable.xml
@@ -104,17 +104,17 @@
                     </states>
                     <transitions>
                         <Transition fromState="*" toState="*">
-                            <NumericAnimation property="r" duration="500" />
+                            <NumberAnimation property="r" duration="500" />
                             <SerialAnimation>
                                 <SetPropertyAction target="{MeRect}" property="moveToParent" value="{Bounce}" />
                                 <ParallelAnimation>
-                                    <NumericAnimation target="{MeRect}" properties="x" to="0" duration="250" />
-                                    <NumericAnimation target="{MeRect}" properties="y" to="0" easing="easeInQuad" duration="250"/>
+                                    <NumberAnimation target="{MeRect}" properties="x" to="0" duration="250" />
+                                    <NumberAnimation target="{MeRect}" properties="y" to="0" easing="easeInQuad" duration="250"/>
                                 </ParallelAnimation>
                                 <SetPropertyAction target="{MeRect}" property="moveToParent" />
                                 <ParallelAnimation>
-                                    <NumericAnimation target="{MeRect}" properties="x" to="0" duration="250"/>
-                                    <NumericAnimation target="{MeRect}" properties="y" to="0" easing="easeOutQuad" duration="250"/>
+                                    <NumberAnimation target="{MeRect}" properties="x" to="0" duration="250"/>
+                                    <NumberAnimation target="{MeRect}" properties="y" to="0" easing="easeOutQuad" duration="250"/>
                                 </ParallelAnimation>
                             </SerialAnimation>
                         </Transition>
diff --git a/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.qml b/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.qml
index 5c00f58..e0880f0 100644
--- a/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.qml
+++ b/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.qml
@@ -11,11 +11,11 @@ Rect {
         y: SequentialAnimation {
             running: true
             repeat: true
-            NumericAnimation {
+            NumberAnimation {
                 to: 0; duration: 500
                 easing: "easeInOutQuad"
             }
-            NumericAnimation {
+            NumberAnimation {
                 to: 200-img.height
                 easing: "easeOutBounce"
                 duration: 2000