Rename Rect.pen to Rect.border

12 files changed, 17 insertions, 17 deletions

diff --git a/examples/declarative/behaviours/MyRect.qml b/examples/declarative/behaviours/MyRect.qml
index 1ccf4db..199b33b 100644
--- a/examples/declarative/behaviours/MyRect.qml
+++ b/examples/declarative/behaviours/MyRect.qml
@@ -2,7 +2,7 @@ import Qt 4.6
 
 Rect {
     radius: 15
-    pen.color: "black"
+    border.color: "black"
     width: 100
     height: 100
     id: Page
diff --git a/examples/declarative/flowview/flickr.qml b/examples/declarative/flowview/flickr.qml
index 1cf0f73..2abf7a1 100644
--- a/examples/declarative/flowview/flickr.qml
+++ b/examples/declarative/flowview/flickr.qml
@@ -2,7 +2,7 @@ import Qt 4.6
 
 Rect { 
     radius: 5; 
-    pen.width: 1; 
+    border.width: 1; 
     width:400; 
     height: 120; 
     color: background; 
diff --git a/examples/declarative/flowview/rect.qml b/examples/declarative/flowview/rect.qml
index 9d81fa4..3fecf17 100644
--- a/examples/declarative/flowview/rect.qml
+++ b/examples/declarative/flowview/rect.qml
@@ -1,4 +1,4 @@
 import Qt 4.6
 
-Rect { radius: 5; pen.width: 1; width:400; height: 120; color: background; }
+Rect { radius: 5; border.width: 1; width:400; height: 120; color: background; }
 
diff --git a/examples/declarative/listview/recipes.qml b/examples/declarative/listview/recipes.qml
index 788e067..8b12527 100644
--- a/examples/declarative/listview/recipes.qml
+++ b/examples/declarative/listview/recipes.qml
@@ -24,7 +24,7 @@ Rect {
                 Rect {
                     id: background
                     x: 1; y: 2; width: parent.width-2; height: parent.height-4
-                    color: "#FEFFEE"; pen.color: "#FFBE4F"; radius: 5
+                    color: "#FEFFEE"; border.color: "#FFBE4F"; radius: 5
                 }
                 // This mouse region covers the entire delegate.
                 // When clicked it changes mode to 'Details'.  If we are already
diff --git a/examples/declarative/loader/Browser.qml b/examples/declarative/loader/Browser.qml
index 64df830..96c2a76 100644
--- a/examples/declarative/loader/Browser.qml
+++ b/examples/declarative/loader/Browser.qml
@@ -82,13 +82,13 @@ Rect {
         id: TitleBar
         width: parent.width
         height: 32
-        color: activePalette.button; pen.color: activePalette.mid
+        color: activePalette.button; border.color: activePalette.mid
 
         Rect {
             id: UpButton
             width: 30
             height: TitleBar.height
-            pen.color: activePalette.mid; color: "transparent"
+            border.color: activePalette.mid; color: "transparent"
             MouseRegion { anchors.fill: parent; onClicked: folders.folder = up(folders.folder) }
             Image { anchors.centerIn: parent; source: "images/up.png" }
         }
diff --git a/examples/declarative/loader/Button.qml b/examples/declarative/loader/Button.qml
index 562e04c..999e180 100644
--- a/examples/declarative/loader/Button.qml
+++ b/examples/declarative/loader/Button.qml
@@ -8,7 +8,7 @@ Rect {
 
     height: Text.height + 10
     width: Text.width + 20
-    pen.width: 1
+    border.width: 1
     radius: 4
     color: "grey"
     MouseRegion { anchors.fill: parent; onClicked: Container.clicked() }
diff --git a/examples/declarative/states/states.qml b/examples/declarative/states/states.qml
index 431f0bc..c4c71b5 100644
--- a/examples/declarative/states/states.qml
+++ b/examples/declarative/states/states.qml
@@ -6,19 +6,19 @@ Rect {
     // A target region.  Clicking in here sets the state to '' - the default state
     Rect {
         x: 0; y: 0; width: 50; height: 50
-        color: "transparent"; pen.color: "black"
+        color: "transparent"; border.color: "black"
         MouseRegion { anchors.fill: parent; onClicked: { Page.state='' } }
     }
     // Another target region.  Clicking in here sets the state to 'Position1'
     Rect {
         x: 150; y: 50; width: 50; height: 50
-        color: "transparent"; pen.color: "black"
+        color: "transparent"; border.color: "black"
         MouseRegion { anchors.fill: parent; onClicked: { Page.state='Position1' } }
     }
     // Another target region.  Clicking in here sets the state to 'Position2'
     Rect {
         x: 0; y: 200; width: 50; height: 50
-        color: "transparent"; pen.color: "black"
+        color: "transparent"; border.color: "black"
         MouseRegion { anchors.fill: parent; onClicked: { Page.state='Position2' } }
     }
     // Rect which will be moved when my state changes
diff --git a/examples/declarative/states/transitions.qml b/examples/declarative/states/transitions.qml
index 7bc7f6c..63ed4d9 100644
--- a/examples/declarative/states/transitions.qml
+++ b/examples/declarative/states/transitions.qml
@@ -6,19 +6,19 @@ Rect {
     // A target region.  Clicking in here sets the state to '' - the default state
     Rect {
         x: 0; y: 0; width: 50; height: 50
-        color: "transparent"; pen.color: "black"
+        color: "transparent"; border.color: "black"
         MouseRegion { anchors.fill: parent; onClicked: { Page.state='' } }
     }
     // Another target region.  Clicking in here sets the state to 'Position1'
     Rect {
         x: 150; y: 50; width: 50; height: 50
-        color: "transparent"; pen.color: "black"
+        color: "transparent"; border.color: "black"
         MouseRegion { anchors.fill: parent; onClicked: { Page.state='Position1' } }
     }
     // Another target region.  Clicking in here sets the state to 'Position2'
     Rect {
         x: 0; y: 200; width: 50; height: 50
-        color: "transparent"; pen.color: "black"
+        color: "transparent"; border.color: "black"
         MouseRegion { anchors.fill: parent; onClicked: { Page.state='Position2' } }
     }
     // Rect which will be moved when my state changes
diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/GroupBox.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/GroupBox.qml
index 29e00d9..d3f626f 100644
--- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/GroupBox.qml
+++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/GroupBox.qml
@@ -16,7 +16,7 @@ FocusRealm {
         width: groupBox.width-20
         height: groupBox.height-20
         color: "white"
-        pen.color: "black"
+        border.color: "black"
         Loader {
             id: subItem
             source: groupBox.contents
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/GroupBox.qml b/examples/declarative/tutorials/contacts/2_Reuse/GroupBox.qml
index 29e00d9..d3f626f 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/GroupBox.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/GroupBox.qml
@@ -16,7 +16,7 @@ FocusRealm {
         width: groupBox.width-20
         height: groupBox.height-20
         color: "white"
-        pen.color: "black"
+        border.color: "black"
         Loader {
             id: subItem
             source: groupBox.contents
diff --git a/examples/declarative/tutorials/contacts/3_Collections/GroupBox.qml b/examples/declarative/tutorials/contacts/3_Collections/GroupBox.qml
index 29e00d9..d3f626f 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/GroupBox.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/GroupBox.qml
@@ -16,7 +16,7 @@ FocusRealm {
         width: groupBox.width-20
         height: groupBox.height-20
         color: "white"
-        pen.color: "black"
+        border.color: "black"
         Loader {
             id: subItem
             source: groupBox.contents
diff --git a/examples/declarative/velocity/Day.qml b/examples/declarative/velocity/Day.qml
index 05e1f07..f7a5a47 100644
--- a/examples/declarative/velocity/Day.qml
+++ b/examples/declarative/velocity/Day.qml
@@ -7,7 +7,7 @@ Rect {
     width: 400
     height: 500
     radius: 7
-    pen.color: "black"
+    border.color: "black"
     id: Page
     Image {
         x: 10