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

Conflicts:
	src/declarative/fx/qfxitem.cpp

9 files changed, 6 insertions, 16 deletions

diff --git a/examples/declarative/dial/DialLibrary/Dial.qml b/examples/declarative/dial/DialLibrary/Dial.qml
index e1b9f18..e2a11b1 100644
--- a/examples/declarative/dial/DialLibrary/Dial.qml
+++ b/examples/declarative/dial/DialLibrary/Dial.qml
@@ -1,12 +1,12 @@
 <Item width="210" height="210">
     <properties><Property name="value" type="real" value="0"/></properties>
     <Image id="Background" src="background.svg"/>
+    <Item x="104" y="102" rotation="{Needle.rotation}">
+        <Image src="needle_shadow.svg" x="-104" y="-102"/>
+    </Item>
     <Item id="Needle" x="102" y="98" rotation="-130">
         <rotation><Follow spring="1.4" damping=".15" source="{Math.min(Math.max(-130, value*2.2 - 130), 133)}"/></rotation>
         <Image src="needle.svg" x="-102" y="-98"/>
     </Item>
-    <Item x="104" y="102" rotation="{Needle.rotation}">
-        <Image src="needle_shadow.svg" x="-104" y="-102"/>
-    </Item>
     <Image src="overlay.svg"/>
 </Item>
diff --git a/examples/declarative/dial/dial.qml b/examples/declarative/dial/dial.qml
index ce43b01..bda9b41 100644
--- a/examples/declarative/dial/dial.qml
+++ b/examples/declarative/dial/dial.qml
@@ -3,7 +3,7 @@
     <!-- Dial with a slider to adjust it -->
     <Dial id="Dial" value="{Slider.x-2}"/>
     <Rect anchors.top="{Dial.bottom}" x="20" width="160" height="16" color="steelblue" gradientColor="lightsteelblue" radius="8" opacity="0.7">
-        <Rect id="Slider" anchors.top="{Dial.bottom}" x="2" y="2" width="30" height="12" color="lightgray" gradientColor="gray" radius="6">
+        <Rect id="Slider" x="2" y="2" width="30" height="12" color="lightgray" gradientColor="gray" radius="6">
             <MouseRegion anchors.fill="{parent}"
                          drag.target="{parent}"
                          drag.axis="x"
diff --git a/examples/declarative/minehunt/minehunt.qml b/examples/declarative/minehunt/minehunt.qml
index 9cde164..9db0e84 100644
--- a/examples/declarative/minehunt/minehunt.qml
+++ b/examples/declarative/minehunt/minehunt.qml
@@ -10,7 +10,7 @@
                     <Axis id="axis" xStart="20" xEnd="20" yStart="20" yEnd="0" />
                 </transform>
                 <front>
-                    <Image src="pics/cachepix-boxless.sci" width="40" height="40">
+                    <Image src="pics/front.png" width="40" height="40">
                         <Image anchors.horizontalCenter="{parent.horizontalCenter}"
                                anchors.verticalCenter="{parent.verticalCenter}"
                                 src="pics/flag.png" opacity="{modelData.hasFlag}">
@@ -23,7 +23,7 @@
                     </Image>
                 </front>
                 <back>
-                    <Image src="pics/cachepix-black.sci" width="40" height="40">
+                    <Image src="pics/back.png" width="40" height="40">
                         <Text anchors.horizontalCenter="{parent.horizontalCenter}" anchors.verticalCenter="{parent.verticalCenter}" 
                               text="{modelData.hint}" color="white" font.bold="true" 
                               opacity="{modelData.hasMine == false &amp;&amp; modelData.hint > 0}"/>
diff --git a/examples/declarative/minehunt/pics/back.png b/examples/declarative/minehunt/pics/back.png
new file mode 100644
index 0000000..f6b3f0b
--- /dev/null
+++ b/examples/declarative/minehunt/pics/back.png
diff --git a/examples/declarative/minehunt/pics/cachepix-black.png b/examples/declarative/minehunt/pics/cachepix-black.png
deleted file mode 100644
index 53db3ae..0000000
--- a/examples/declarative/minehunt/pics/cachepix-black.png
+++ /dev/null
diff --git a/examples/declarative/minehunt/pics/cachepix-black.sci b/examples/declarative/minehunt/pics/cachepix-black.sci
deleted file mode 100644
index 21d5436..0000000
--- a/examples/declarative/minehunt/pics/cachepix-black.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-gridLeft: 10
-gridTop: 10
-gridBottom: 10
-gridRight: 10
-imageFile: cachepix-black.png
diff --git a/examples/declarative/minehunt/pics/cachepix-boxless.png b/examples/declarative/minehunt/pics/cachepix-boxless.png
deleted file mode 100644
index 288e0e4..0000000
--- a/examples/declarative/minehunt/pics/cachepix-boxless.png
+++ /dev/null
diff --git a/examples/declarative/minehunt/pics/cachepix-boxless.sci b/examples/declarative/minehunt/pics/cachepix-boxless.sci
deleted file mode 100644
index d224fd9..0000000
--- a/examples/declarative/minehunt/pics/cachepix-boxless.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-gridLeft: 10
-gridTop: 10
-gridBottom: 10
-gridRight: 10
-imageFile: cachepix-boxless.png
diff --git a/examples/declarative/minehunt/pics/front.png b/examples/declarative/minehunt/pics/front.png
new file mode 100644
index 0000000..834331b
--- /dev/null
+++ b/examples/declarative/minehunt/pics/front.png