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

7 files changed, 27 insertions, 27 deletions

diff --git a/src/declarative/fx/qfxflipable.cpp b/src/declarative/fx/qfxflipable.cpp
index db390d2..24ae428 100644
--- a/src/declarative/fx/qfxflipable.cpp
+++ b/src/declarative/fx/qfxflipable.cpp
@@ -80,8 +80,8 @@ Flipable {
         endX: 20
         endY: 40
     }
-    front: Image { src: "front.png" }
-    back: Image { src: "back.png" }
+    front: Image { source: "front.png" }
+    back: Image { source: "back.png" }
     states: [
         State {
             name: "back"
diff --git a/src/declarative/fx/qfximage.cpp b/src/declarative/fx/qfximage.cpp
index 53c6137..838da30 100644
--- a/src/declarative/fx/qfximage.cpp
+++ b/src/declarative/fx/qfximage.cpp
@@ -203,8 +203,8 @@ QFxScaleGrid *QFxImage::scaleGrid()
     \qml
     Item {
         Image { source: "tile.png" }
-        Image { x: 80; width: 100; height: 100; src: "tile.png" }
-        Image { x: 190; width: 100; height: 100; tile: true; src: "tile.png" }
+        Image { x: 80; width: 100; height: 100; source: "tile.png" }
+        Image { x: 190; width: 100; height: 100; tile: true; source: "tile.png" }
     }
     \endqml
     \image declarative-image_tile.png
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index 84dc484..ecc2d65 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -448,7 +448,7 @@ QFxItem::~QFxItem()
     This example scales an image about its center.
     \qml
     Image {
-        src: "myimage.png"
+        source: "myimage.png"
         transformOrigin: "Center"
         scale: 4
     }
diff --git a/src/declarative/fx/qfxparticles.cpp b/src/declarative/fx/qfxparticles.cpp
index 45de1a3..0ac537a 100644
--- a/src/declarative/fx/qfxparticles.cpp
+++ b/src/declarative/fx/qfxparticles.cpp
@@ -251,7 +251,7 @@ Rect {
         y: 0
         width: parent.width
         height: 30
-        src: "star.png"
+        source: "star.png"
         lifeSpan: 5000
         count: 50
         angle: 70
@@ -543,7 +543,7 @@ Rect {
         y: 0
         width: parent.width
         height: 30
-        src: "star.png"
+        source: "star.png"
         lifeSpan: 5000
         count: 50
         angle: 70
@@ -560,7 +560,7 @@ Rect {
         x: 120
         width: 1
         height: 1
-        src: "star.png"
+        source: "star.png"
         lifeSpan: 5000
         count: 200
         angle: 270
@@ -698,7 +698,7 @@ void QFxParticles::setCount(int cnt)
 
     \qml
 Particles {
-    src: "star.png"
+    source: "star.png"
     lifeSpan: 200
     lifeSpanDeviation: 100
 }
@@ -735,7 +735,7 @@ void QFxParticles::setLifeSpan(int ls)
 
 \qml
 Particles {
-    src: "star.png"
+    source: "star.png"
     lifeSpan: 200
     lifeSpanDeviation: 100
 }
@@ -813,7 +813,7 @@ void QFxParticles::setFadeOutDuration(int dur)
 
     \qml
 Particles {
-    src: "star.png"
+    source: "star.png"
     angle: 60
     angleDeviation: 90
 }
@@ -848,7 +848,7 @@ void QFxParticles::setAngle(qreal angle)
 
 \qml
 Particles {
-    src: "star.png"
+    source: "star.png"
     angle: 60
     angleDeviation: 90
 }
@@ -880,7 +880,7 @@ void QFxParticles::setAngleDeviation(qreal dev)
 
     \qml
 Particles {
-    src: "star.png"
+    source: "star.png"
     velocity: 50
     velocityDeviation: 20
 }
@@ -915,7 +915,7 @@ void QFxParticles::setVelocity(qreal velocity)
 
 \qml
 Particles {
-    src: "star.png"
+    source: "star.png"
     velocity: 50
     velocityDeviation: 20
 }
diff --git a/src/declarative/fx/qfxreflectionfilter.cpp b/src/declarative/fx/qfxreflectionfilter.cpp
index a55f374..0bc01a7 100644
--- a/src/declarative/fx/qfxreflectionfilter.cpp
+++ b/src/declarative/fx/qfxreflectionfilter.cpp
@@ -72,23 +72,23 @@ public:
     \qml
 HorizontalLayout {
     Image {
-        src: "icon.png"
+        source: "icon.png"
         filter: Reflection { }
     }
     Image {
-        src: "icon.png"
+        source: "icon.png"
         filter: Reflection { offset: 1 }
     }
     Image {
-        src: "icon.png"
+        source: "icon.png"
         filter: Reflection { offset: 1; alpha: 0.5 }
     }
     Image {
-        src: "icon.png"
+        source: "icon.png"
         filter: Reflection { offset: 1; alpha: 0.5; height: 50 }
     }
     Image {
-        src: "icon.png"
+        source: "icon.png"
         filter: Reflection { offset: 1; alpha: 0.5; height: 50; scale: 0.5 }
     }
 }
@@ -147,7 +147,7 @@ void QFxReflectionFilter::setAlpha(qreal a)
     \qml 
 Image {
     id: myImage
-    src: "album.png"
+    source: "album.png"
     filter: Reflection {
         height: myImage.height * 0.5
     }
diff --git a/src/declarative/fx/qfxshadowfilter.cpp b/src/declarative/fx/qfxshadowfilter.cpp
index 4d34f74..83c1b47 100644
--- a/src/declarative/fx/qfxshadowfilter.cpp
+++ b/src/declarative/fx/qfxshadowfilter.cpp
@@ -86,7 +86,7 @@ Rect {
 }
 
 Image {
-    src: "pics/qtlogo.png"
+    source: "pics/qtlogo.png"
     filter: Shadow {
         yOffset: 8
         xOffset: 8
diff --git a/src/declarative/fx/qfxtransform.cpp b/src/declarative/fx/qfxtransform.cpp
index 1fe02d1..71ca716 100644
--- a/src/declarative/fx/qfxtransform.cpp
+++ b/src/declarative/fx/qfxtransform.cpp
@@ -322,7 +322,7 @@ void QFxRotation3D::update()
     The following example translates the image to 10, 3.
     \qml
 Image {
-    src: "logo.png"
+    source: "logo.png"
     transform: [
         Translation3D {
             axis.startX: 0
@@ -520,9 +520,9 @@ QMatrix4x4 QFxPerspective::transform() const
         HorizontalLayout {
             margin: 10
             spacing: 10
-            Image { src: "qt.png" }
+            Image { source: "qt.png" }
             Image {
-                src: "qt.png"
+                source: "qt.png"
                 transform: Squish {
                     x:0; y:0; width:60; height:60
                     topLeftX:0; topLeftY:0
@@ -532,7 +532,7 @@ QMatrix4x4 QFxPerspective::transform() const
                 }
             }
             Image {
-                src: "qt.png"
+                source: "qt.png"
                 transform: Squish {
                     x:0; y:0; width:60; height:60
                     topLeftX:0; topLeftY:0
@@ -542,7 +542,7 @@ QMatrix4x4 QFxPerspective::transform() const
                 }
             }
             Image {
-                src: "qt.png"
+                source: "qt.png"
                 transform: Squish {
                     x:0; y:0; width:60; height:60
                     topLeftX:0; topLeftY:10
@@ -552,7 +552,7 @@ QMatrix4x4 QFxPerspective::transform() const
                 }
             }
             Image {
-                src: "qt.png"
+                source: "qt.png"
                 transform: Squish {
                     x:0; y:0; width:60; height:60
                     topLeftX:10; topLeftY:0