Rename Rect.pen to Rect.border

9 files changed, 11 insertions, 11 deletions

diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml
index 1cc8fa8..576fea9 100644
--- a/demos/declarative/calculator/calculator.qml
+++ b/demos/declarative/calculator/calculator.qml
@@ -12,7 +12,7 @@ Rect {
         Rect {
             id: Container
             width: 316; height: 60; z: 2
-            pen.color: "white"; color: "#343434"
+            border.color: "white"; color: "#343434"
 
             Text {
                 id: CurNum
diff --git a/demos/declarative/contacts/contacts.qml b/demos/declarative/contacts/contacts.qml
index 6bd7b21..ecafd20 100644
--- a/demos/declarative/contacts/contacts.qml
+++ b/demos/declarative/contacts/contacts.qml
@@ -213,7 +213,7 @@ Rect {
         highlight: [
             Rect {
                 id: contactHighlight
-                pen.width: 0
+                border.width: 0
                 color: 'white'
                 opacity: contacts.mode == 'list' ? 1 : 0
                 opacity: Behavior {
diff --git a/demos/declarative/flickr/content/ImageDetails.qml b/demos/declarative/flickr/content/ImageDetails.qml
index 2be0e4d..9d5f069 100644
--- a/demos/declarative/flickr/content/ImageDetails.qml
+++ b/demos/declarative/flickr/content/ImageDetails.qml
@@ -30,7 +30,7 @@ Flipable {
         Rect {
             anchors.fill: parent
             color: "black"; opacity: 0.4
-            pen.color: "white"; pen.width: 2
+            border.color: "white"; border.width: 2
         }
 
         MediaButton {
@@ -77,7 +77,7 @@ Flipable {
     back: Item {
         anchors.fill: Container
 
-        Rect { anchors.fill: parent; color: "black"; opacity: 0.4; pen.color: "white"; pen.width: 2 }
+        Rect { anchors.fill: parent; color: "black"; opacity: 0.4; border.color: "white"; border.width: 2 }
 
         Progress { anchors.centerIn: parent; width: 200; height: 18; progress: BigImage.progress; visible: BigImage.status }
         Flickable {
diff --git a/demos/declarative/flickr/content/Progress.qml b/demos/declarative/flickr/content/Progress.qml
index 4b092ca..ae6bb18 100644
--- a/demos/declarative/flickr/content/Progress.qml
+++ b/demos/declarative/flickr/content/Progress.qml
@@ -7,7 +7,7 @@ Item {
 
     Rect {
         id: Container; anchors.fill: parent
-        pen.color: "white"; pen.width: 0; radius: height/2 - 2
+        border.color: "white"; border.width: 0; radius: height/2 - 2
         gradient: Gradient {
             GradientStop { position: 0; color: "#66343434" }
             GradientStop { position: 1.0; color: "#66000000" }
diff --git a/demos/declarative/flickr/content/ScrollBar.qml b/demos/declarative/flickr/content/ScrollBar.qml
index 25dca98..e9a461c 100644
--- a/demos/declarative/flickr/content/ScrollBar.qml
+++ b/demos/declarative/flickr/content/ScrollBar.qml
@@ -9,8 +9,8 @@ Item {
         radius: 5
         color: "black"
         opacity: 0.3
-        pen.color: "white"
-        pen.width: 2
+        border.color: "white"
+        border.width: 2
         x: 0
         y: flickableArea.pageYPosition * Container.height
         width: parent.width
diff --git a/demos/declarative/flickr/content/Slider.qml b/demos/declarative/flickr/content/Slider.qml
index 4e88c1e..0c15ec6 100644
--- a/demos/declarative/flickr/content/Slider.qml
+++ b/demos/declarative/flickr/content/Slider.qml
@@ -12,7 +12,7 @@ Item {
 
     Rect {
         id: Container; anchors.fill: parent
-        pen.color: "white"; pen.width: 0; radius: 8
+        border.color: "white"; border.width: 0; radius: 8
         gradient: Gradient {
             GradientStop { position: 0.0; color: "#66343434" }
             GradientStop { position: 1.0; color: "#66000000" }
diff --git a/demos/declarative/samegame/SameGame.qml b/demos/declarative/samegame/SameGame.qml
index cb4737a..e74646d 100644
--- a/demos/declarative/samegame/SameGame.qml
+++ b/demos/declarative/samegame/SameGame.qml
@@ -9,7 +9,7 @@ Rect {
     Rect {
         id: gameCanvas
         property int score: 0
-        z:20; y:20; color: "white"; pen.width: 1
+        z:20; y:20; color: "white"; border.width: 1
         width:parent.width - tileSize - (parent.width % tileSize); 
         height:parent.height - tileSize - (parent.height % tileSize); 
         anchors.horizontalCenter: parent.horizontalCenter
diff --git a/demos/declarative/samegame/content/Button.qml b/demos/declarative/samegame/content/Button.qml
index 152c996..c7a49f1 100644
--- a/demos/declarative/samegame/content/Button.qml
+++ b/demos/declarative/samegame/content/Button.qml
@@ -2,7 +2,7 @@ import Qt 4.6
 
 Rect { 
     id: page; color: activePalette.button; width: txtItem.width+20; height: txtItem.height+4
-    pen.width: 1; pen.color: activePalette.mid; radius: 10;
+    border.width: 1; border.color: activePalette.mid; radius: 10;
     signal clicked
     property string text: "Button"
     gradient: Gradient { 
diff --git a/demos/declarative/samegame/content/Dialog.qml b/demos/declarative/samegame/content/Dialog.qml
index 939f66f..7326d73 100644
--- a/demos/declarative/samegame/content/Dialog.qml
+++ b/demos/declarative/samegame/content/Dialog.qml
@@ -2,7 +2,7 @@ import Qt 4.6
 
 Rect {
     id: page
-    color: "white"; pen.width: 1; width: 200; height: 60;
+    color: "white"; border.width: 1; width: 200; height: 60;
     property string text: "Hello World!"
     opacity: 0
     opacity: Behavior {