4 files changed, 13 insertions, 13 deletions
diff --git a/demos/declarative/flickr/mobile/Button.qml b/demos/declarative/flickr/mobile/Button.qml
index a4a96d4..770330c 100644
--- a/demos/declarative/flickr/mobile/Button.qml
+++ b/demos/declarative/flickr/mobile/Button.qml
@@ -26,7 +26,7 @@ Item {
     Text {
         color: "white"
         anchors.centerIn: buttonImage; font.bold: true
-        text: container.text; style: "Raised"; styleColor: "black"
+        text: container.text; style: Text.Raised; styleColor: "black"
     }
     states: [
         State {
diff --git a/demos/declarative/flickr/mobile/ImageDetails.qml b/demos/declarative/flickr/mobile/ImageDetails.qml
index 26052b9..1963bf5 100644
--- a/demos/declarative/flickr/mobile/ImageDetails.qml
+++ b/demos/declarative/flickr/mobile/ImageDetails.qml
@@ -39,13 +39,13 @@ Flipable {
                 right: parent.right; rightMargin: 20
                 top: parent.top; topMargin: 180
             }
-            Text { font.bold: true; color: "white"; elide: "ElideRight"; text: container.photoTitle }
-            Text { color: "white"; elide: "ElideRight"; text: "<b>Size:</b> " + container.photoWidth + 'x' + container.photoHeight }
-            Text { color: "white"; elide: "ElideRight"; text: "<b>Type:</b> " + container.photoType }
-            Text { color: "white"; elide: "ElideRight"; text: "<b>Author:</b> " + container.photoAuthor }
-            Text { color: "white"; elide: "ElideRight"; text: "<b>Published:</b> " + container.photoDate }
-            Text { color: "white"; elide: "ElideRight"; text: container.photoTags == "" ? "" : "<b>Tags:</b> " }
-            Text { color: "white"; elide: "ElideRight"; elide: "ElideRight"; text: container.photoTags }
+            Text { font.bold: true; color: "white"; elide: Text.ElideRight; text: container.photoTitle }
+            Text { color: "white"; elide: Text.ElideRight; text: "<b>Size:</b> " + container.photoWidth + 'x' + container.photoHeight }
+            Text { color: "white"; elide: Text.ElideRight; text: "<b>Type:</b> " + container.photoType }
+            Text { color: "white"; elide: Text.ElideRight; text: "<b>Author:</b> " + container.photoAuthor }
+            Text { color: "white"; elide: Text.ElideRight; text: "<b>Published:</b> " + container.photoDate }
+            Text { color: "white"; elide: Text.ElideRight; text: container.photoTags == "" ? "" : "<b>Tags:</b> " }
+            Text { color: "white"; elide: Text.ElideRight; elide: Text.ElideRight; text: container.photoTags }
         }
     }
 
diff --git a/demos/declarative/flickr/mobile/ListDelegate.qml b/demos/declarative/flickr/mobile/ListDelegate.qml
index 090e91a..75c4572 100644
--- a/demos/declarative/flickr/mobile/ListDelegate.qml
+++ b/demos/declarative/flickr/mobile/ListDelegate.qml
@@ -14,9 +14,9 @@ Component {
             }
             Column {
                 x: 92; width: wrapper.ListView.view.width - 95; y: 15; spacing: 2
-                Text { text: title; color: "white"; width: parent.width; font.bold: true; elide: "ElideRight"; style: "Raised"; styleColor: "black" }
-                Text { text: photoAuthor; color: "white"; width: parent.width; elide: "ElideLeft"; color: "#cccccc"; style: "Raised"; styleColor: "black" }
-                Text { text: photoDate; color: "white"; width: parent.width; elide: "ElideRight"; color: "#cccccc"; style: "Raised"; styleColor: "black" }
+                Text { text: title; color: "white"; width: parent.width; font.bold: true; elide: Text.ElideRight; style: Text.Raised; styleColor: "black" }
+                Text { text: photoAuthor; color: "white"; width: parent.width; elide: Text.ElideLeft; color: "#cccccc"; style: Text.Raised; styleColor: "black" }
+                Text { text: photoDate; color: "white"; width: parent.width; elide: Text.ElideRight; color: "#cccccc"; style: Text.Raised; styleColor: "black" }
             }
         }
     }
diff --git a/demos/declarative/flickr/mobile/TitleBar.qml b/demos/declarative/flickr/mobile/TitleBar.qml
index 108faf7..07b9762 100644
--- a/demos/declarative/flickr/mobile/TitleBar.qml
+++ b/demos/declarative/flickr/mobile/TitleBar.qml
@@ -25,9 +25,9 @@ Item {
                 left: parent.left; right: tagButton.left; leftMargin: 10; rightMargin: 10
                 verticalCenter: parent.verticalCenter
             }
-            elide: "ElideLeft"
+            elide: Text.ElideLeft
             text: (rssModel.tags=="" ? untaggedString : taggedString + rssModel.tags)
-            font.bold: true; color: "White"; style: "Raised"; styleColor: "Black"
+            font.bold: true; color: "White"; style: Text.Raised; styleColor: "Black"
         }
 
         Button {