Disallow using typenames as ids

This is now illegal:
    import Qt 4.6
    Item { id: Item }
as is
    import Qt 4.6
    Item { id: Text }

2 files changed, 7 insertions, 7 deletions

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 {