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

6 files changed, 83 insertions, 0 deletions

diff --git a/examples/declarative/clock/Clock.qml b/examples/declarative/clock/Clock.qml
new file mode 100644
index 0000000..4779bd5
--- /dev/null
+++ b/examples/declarative/clock/Clock.qml
@@ -0,0 +1,78 @@
+Item {
+    id: Clock
+    width: 200; height: 200
+    property var time
+    property var hours
+    property var minutes
+    property var seconds
+    onTimeChanged: {
+        var date = new Date;
+        hours = date.getHours();
+        minutes = date.getMinutes();
+        seconds = date.getSeconds();
+    }
+    Timer {
+        interval: 500; running: true; repeat: true; triggeredOnStart: true
+        onTriggered: Clock.time = new Date()
+    }
+
+    Image { source: "background.png" }
+    Image {
+        x: 95
+        y: 54
+        source: "hour.png"
+        smooth: true
+        transform: Rotation {
+            id: HourRotation
+            originX: 4; originY: 45
+            angle: 0
+            angle: Follow {
+                spring: 2
+                damping: .2
+                source: Clock.hours * 50 * 3 + Clock.minutes / 2
+            }
+        }
+    }
+    Image {
+        x: 95
+        y: 30
+        source: "minute.png"
+        smooth: true
+        transform: Rotation {
+            id: MinuteRotation
+            originX: 4; originY: 70
+            angle: 0
+            angle: Follow {
+                spring: 2
+                damping: .2
+                source: Clock.minutes * 6
+            }
+        }
+    }
+    Image {
+        x: 96
+        y: 40
+        source: "second.png"
+        smooth: true
+        transform: Rotation {
+            id: SecondRotation
+            originX: 2; originY: 60
+            angle: 0
+            angle: Follow {
+                spring: 5
+                damping: .25
+                modulus: 360
+                source: Clock.seconds * 6
+            }
+        }
+    }
+
+    Rect {
+        x: 93
+        y: 94
+        width: 11
+        height: 11
+        radius: 5
+        color: "black"
+    }
+}
diff --git a/examples/declarative/clock/background.png b/examples/declarative/clock/background.png
new file mode 100644
index 0000000..a885950
--- /dev/null
+++ b/examples/declarative/clock/background.png
diff --git a/examples/declarative/clock/display.qml b/examples/declarative/clock/display.qml
new file mode 100644
index 0000000..0187a7e
--- /dev/null
+++ b/examples/declarative/clock/display.qml
@@ -0,0 +1,5 @@
+Rect {
+    width: contents.width
+    height: contents.height
+    Clock { id: Clock }
+}
diff --git a/examples/declarative/clock/hour.png b/examples/declarative/clock/hour.png
new file mode 100644
index 0000000..603466b
--- /dev/null
+++ b/examples/declarative/clock/hour.png
diff --git a/examples/declarative/clock/minute.png b/examples/declarative/clock/minute.png
new file mode 100644
index 0000000..0207405
--- /dev/null
+++ b/examples/declarative/clock/minute.png
diff --git a/examples/declarative/clock/second.png b/examples/declarative/clock/second.png
new file mode 100644
index 0000000..bfcef68
--- /dev/null
+++ b/examples/declarative/clock/second.png