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/demos/declarative/flickr/common/ImageDetails.qml b/demos/declarative/flickr/common/ImageDetails.qml
index dcd44eb..6b42910 100644
--- a/demos/declarative/flickr/common/ImageDetails.qml
+++ b/demos/declarative/flickr/common/ImageDetails.qml
@@ -19,7 +19,7 @@ Flipable {
     signal closed
 
     transform: Rotation {
-        id: Rotation
+        id: DetailsRotation
         origin.x: Container.width / 2;
         axis.y: 1; axis.z: 0
     }
@@ -48,7 +48,7 @@ Flipable {
 
         LikeOMeter { x: 40; y: 250; rating: Container.rating }
 
-        Flickable { id: Flickable; x: 220; width: 480; height: 210; y: 130; clip: true
+        Flickable { id: FlickSurface; x: 220; width: 480; height: 210; y: 130; clip: true
                     viewportWidth: 480; viewportHeight: DescriptionText.height
 
             WebView { id: DescriptionText; width: parent.width
@@ -70,8 +70,8 @@ Flipable {
                 anchors.left: TagsLabel.right; anchors.top: Date.bottom;
                 elide: "ElideRight"; text: Container.photoTags }
 
-        ScrollBar { id: ScrollBar; x: 720; y: Flickable.y; width: 7; height: Flickable.height; opacity: 0;
-                    flickableArea: Flickable; clip: true }
+        ScrollBar { id: ScrollBar; x: 720; y: FlickSurface.y; width: 7; height: FlickSurface.height; opacity: 0;
+                    flickableArea: FlickSurface; clip: true }
     }
 
     back: Item {
@@ -136,7 +136,7 @@ Flipable {
     states: [
         State {
             name: "Back"
-            PropertyChanges { target: Rotation; angle: 180 }
+            PropertyChanges { target: DetailsRotation; angle: 180 }
         }
     ]
 
diff --git a/demos/declarative/flickr/common/MediaButton.qml b/demos/declarative/flickr/common/MediaButton.qml
index 0ffd596..e1e09e8 100644
--- a/demos/declarative/flickr/common/MediaButton.qml
+++ b/demos/declarative/flickr/common/MediaButton.qml
@@ -8,7 +8,7 @@ Item {
     property string text
 
     Image {
-        id: Image
+        id: ButtonImage
         source: "pics/button.png"
     }
     Image {
@@ -17,21 +17,21 @@ Item {
         opacity: 0
     }
     MouseRegion {
-        id: MouseRegion
-        anchors.fill: Image
+        id: MyMouseRegion
+        anchors.fill: ButtonImage
         onClicked: { Container.clicked(); }
     }
     Text {
         font.bold: true
         color: "white"
-        anchors.centerIn: Image
+        anchors.centerIn: ButtonImage
         text: Container.text
     }
-    width: Image.width
+    width: ButtonImage.width
     states: [
         State {
             name: "Pressed"
-            when: MouseRegion.pressed == true
+            when: MyMouseRegion.pressed == true
             PropertyChanges {
                 target: Pressed
                 opacity: 1
diff --git a/demos/declarative/flickr/common/MediaLineEdit.qml b/demos/declarative/flickr/common/MediaLineEdit.qml
index 500a402..eab0b95 100644
--- a/demos/declarative/flickr/common/MediaLineEdit.qml
+++ b/demos/declarative/flickr/common/MediaLineEdit.qml
@@ -7,7 +7,7 @@ Item {
     property string text
 
     width: Math.max(94,Label.width + Editor.width + 20)
-    height: Image.height
+    height: ButtonImage.height
 
     states: [
         State {
@@ -48,7 +48,7 @@ Item {
 
 
     BorderImage {
-        id: Image
+        id: ButtonImage
         source: "pics/button.sci"
         anchors.left: Container.left
         anchors.right: Container.right
@@ -63,12 +63,12 @@ Item {
     }
 
     MouseRegion {
-        id: MouseRegion
-        anchors.fill: Image
+        id: MyMouseRegion
+        anchors.fill: ButtonImage
         onClicked: { Container.state = Container.state=="Edit" ? "" : "Edit" }
         states: [
             State {
-                when: MouseRegion.pressed == true
+                when: MyMouseRegion.pressed == true
                 PropertyChanges {
                     target: Pressed
                     opacity: 1
diff --git a/demos/declarative/flickr/common/Star.qml b/demos/declarative/flickr/common/Star.qml
index 006e86ad..c4d1bec 100644
--- a/demos/declarative/flickr/common/Star.qml
+++ b/demos/declarative/flickr/common/Star.qml
@@ -11,7 +11,7 @@ Item {
     signal clicked
 
     Image {
-        id: Image
+        id: StarImage
         source: "pics/ghns_star.png"
         x: 6
         y: 7
@@ -27,7 +27,7 @@ Item {
             name: "on"
             when: Container.on == true
             PropertyChanges {
-                target: Image
+                target: StarImage
                 opacity: 1
                 scale: 1
                 x: 1
diff --git a/demos/declarative/flickr/flickr-desktop.qml b/demos/declarative/flickr/flickr-desktop.qml
index fca7e31..6a4efd9 100644
--- a/demos/declarative/flickr/flickr-desktop.qml
+++ b/demos/declarative/flickr/flickr-desktop.qml
@@ -15,7 +15,7 @@ Item {
             scale: Wrapper.PathView.scale; z: Wrapper.PathView.z
 
             transform: Rotation {
-                id: Rotation; origin.x: Wrapper.width/2; origin.y: Wrapper.height/2
+                id: ItemRotation; origin.x: Wrapper.width/2; origin.y: Wrapper.height/2
                 axis.y: 1; axis.z: 0; angle: Wrapper.PathView.angle
             }
 
@@ -67,7 +67,7 @@ Item {
                     PropertyChanges { target: ImageDetails; z: 2 }
                     ParentChange { target: Wrapper; parent: ImageDetails.frontContainer }
                     PropertyChanges { target: Wrapper; x: 45; y: 35; scale: 1; z: 1000 }
-                    PropertyChanges { target: Rotation; angle: 0 }
+                    PropertyChanges { target: ItemRotation; angle: 0 }
                     PropertyChanges { target: Shadows; opacity: 0 }
                     PropertyChanges { target: ImageDetails; y: 20 }
                     PropertyChanges { target: PhotoGridView; y: "-480" }
diff --git a/demos/declarative/flickr/mobile/Button.qml b/demos/declarative/flickr/mobile/Button.qml
index 3a0b42e..6887240 100644
--- a/demos/declarative/flickr/mobile/Button.qml
+++ b/demos/declarative/flickr/mobile/Button.qml
@@ -8,7 +8,7 @@ Item {
     property string text
 
     BorderImage {
-        id: Image
+        id: ButtonImage
         source: "images/toolbutton.sci"
         width: Container.width; height: Container.height
     }
@@ -19,19 +19,19 @@ Item {
         width: Container.width; height: Container.height
     }
     MouseRegion {
-        id: MouseRegion
-        anchors.fill: Image
+        id: MyMouseRegion
+        anchors.fill: ButtonImage
         onClicked: { Container.clicked(); }
     }
     Text {
         color: "white"
-        anchors.centerIn: Image; font.bold: true
+        anchors.centerIn: ButtonImage; font.bold: true
         text: Container.text; style: "Raised"; styleColor: "black"
     }
     states: [
         State {
             name: "Pressed"
-            when: MouseRegion.pressed == true
+            when: MyMouseRegion.pressed == true
             PropertyChanges {
                 target: Pressed
                 opacity: 1
diff --git a/demos/declarative/flickr/mobile/ImageDetails.qml b/demos/declarative/flickr/mobile/ImageDetails.qml
index 5f16a24..617fe40 100644
--- a/demos/declarative/flickr/mobile/ImageDetails.qml
+++ b/demos/declarative/flickr/mobile/ImageDetails.qml
@@ -19,7 +19,7 @@ Flipable {
     signal closed
 
     transform: Rotation {
-        id: Rotation
+        id: ItemRotation
         origin.x: Container.width / 2;
         axis.y: 1; axis.z: 0
     }
@@ -116,7 +116,7 @@ Flipable {
 
     states: State {
         name: "Back"
-        PropertyChanges { target: Rotation; angle: 180 }
+        PropertyChanges { target: ItemRotation; angle: 180 }
     }
 
     transitions: Transition {