2 files changed, 30 insertions, 15 deletions
diff --git a/examples/declarative/progressbar/content/ProgressBar.qml b/examples/declarative/progressbar/content/ProgressBar.qml
index d82d89d..bc36df5 100644
--- a/examples/declarative/progressbar/content/ProgressBar.qml
+++ b/examples/declarative/progressbar/content/ProgressBar.qml
@@ -2,36 +2,42 @@ import Qt 4.7
 
 Item {
     id: progressbar
-    width: 250; height: 23; clip: true
 
     property int minimum: 0
     property int maximum: 100
     property int value: 0
-    property alias color: g1.color
-    property alias secondColor: g2.color
+    property alias color: gradient1.color
+    property alias secondColor: gradient2.color
+
+    width: 250; height: 23
+    clip: true
 
     BorderImage {
         source: "background.png"
         width: parent.width; height: parent.height
-        border.left: 4; border.top: 4; border.right: 4; border.bottom: 4
+        border { left: 4; top: 4; right: 4; bottom: 4 }
     }
 
     Rectangle {
+        id: highlight
+
         property int widthDest: ((progressbar.width * (value - minimum)) / (maximum - minimum) - 6)
-        id: highlight; radius: 1
-        anchors.left: parent.left; anchors.top: parent.top; anchors.bottom: parent.bottom
-        anchors.leftMargin: 3; anchors.topMargin: 3; anchors.bottomMargin: 3
+
         width: highlight.widthDest
         Behavior on width { SmoothedAnimation { velocity: 1200 } }
+
+        anchors { left: parent.left; top: parent.top; bottom: parent.bottom; leftMargin: 3; topMargin: 3; bottomMargin: 3 }
+        radius: 1
         gradient: Gradient {
-            GradientStop { id: g1; position: 0.0 }
-            GradientStop { id: g2; position: 1.0 }
+            GradientStop { id: gradient1; position: 0.0 }
+            GradientStop { id: gradient2; position: 1.0 }
         }
+
     }
     Text {
-        anchors.right: highlight.right; anchors.rightMargin: 6
-        color: "white"; font.bold: true
-        anchors.verticalCenter: parent.verticalCenter
+        anchors { right: highlight.right; rightMargin: 6; verticalCenter: parent.verticalCenter }
+        color: "white"
+        font.bold: true
         text: Math.floor((value - minimum) / (maximum - minimum) * 100) + '%'
     }
 }
diff --git a/examples/declarative/progressbar/progressbars.qml b/examples/declarative/progressbar/progressbars.qml
index e10c9f0..55fd682 100644
--- a/examples/declarative/progressbar/progressbars.qml
+++ b/examples/declarative/progressbar/progressbars.qml
@@ -3,17 +3,26 @@ import "content"
 
 Rectangle {
     id: main
-    width: 600; height: 405; color: "#edecec"
+
+    width: 600; height: 405
+    color: "#edecec"
 
     Flickable {
-        anchors.fill: parent; contentHeight: column.height + 20
+        anchors.fill: parent
+        contentHeight: column.height + 20
+
         Column {
-            id: column; x: 10; y: 10; spacing: 10
+            id: column
+            x: 10; y: 10
+            spacing: 10
+
             Repeater {
                 model: 25
+
                 ProgressBar {
                     property int r: Math.floor(Math.random() * 5000 + 1000)
                     width: main.width - 20
+
                     NumberAnimation on value { duration: r; from: 0; to: 100; loops: Animation.Infinite }
                     ColorAnimation on color { duration: r; from: "lightsteelblue"; to: "thistle"; loops: Animation.Infinite }
                     ColorAnimation on secondColor { duration: r; from: "steelblue"; to: "#CD96CD"; loops: Animation.Infinite }