diff options
Diffstat (limited to 'examples')
88 files changed, 178 insertions, 178 deletions
diff --git a/examples/declarative/animation/animation.qml b/examples/declarative/animation/animation.qml index 2ea6616..ccfe164 100644 --- a/examples/declarative/animation/animation.qml +++ b/examples/declarative/animation/animation.qml @@ -1,10 +1,10 @@ import Qt 4.6 -Rect { +Rectangle { width: 400 height: 200 color: "white" - Rect { + Rectangle { width: 40 height: 40 y: 80 diff --git a/examples/declarative/aspectratio/face_fit.qml b/examples/declarative/aspectratio/face_fit.qml index 95105e1..4573160 100644 --- a/examples/declarative/aspectratio/face_fit.qml +++ b/examples/declarative/aspectratio/face_fit.qml @@ -6,7 +6,7 @@ import Qt 4.6 // when the edges of the image contain less vital information than the // center - such as a face. // -Rect { +Rectangle { // default size: whole image, unscaled width: Image.width height: Image.height diff --git a/examples/declarative/aspectratio/face_fit_animated.qml b/examples/declarative/aspectratio/face_fit_animated.qml index a1b9213..2768150 100644 --- a/examples/declarative/aspectratio/face_fit_animated.qml +++ b/examples/declarative/aspectratio/face_fit_animated.qml @@ -4,7 +4,7 @@ import Qt 4.6 // diverse and usage-specific behaviours are made possible by NOT putting a // hard-coded aspect ratio feature into the Image primitive. // -Rect { +Rectangle { // default size: whole image, unscaled width: Image.width height: Image.height diff --git a/examples/declarative/aspectratio/scale_and_crop.qml b/examples/declarative/aspectratio/scale_and_crop.qml index 20169f9..75080b4 100644 --- a/examples/declarative/aspectratio/scale_and_crop.qml +++ b/examples/declarative/aspectratio/scale_and_crop.qml @@ -2,7 +2,7 @@ import Qt 4.6 // Here, we implement "Scale and Crop" behaviour. // -Rect { +Rectangle { // default size: whole image, unscaled width: Image.width height: Image.height diff --git a/examples/declarative/aspectratio/scale_and_sidecrop.qml b/examples/declarative/aspectratio/scale_and_sidecrop.qml index c3aa742..a6bd2c8 100644 --- a/examples/declarative/aspectratio/scale_and_sidecrop.qml +++ b/examples/declarative/aspectratio/scale_and_sidecrop.qml @@ -3,7 +3,7 @@ import Qt 4.6 // Here, we implement a variant of "Scale and Crop" behaviour, where we // crop the sides if necessary to fully fit vertically, but not the reverse. // -Rect { +Rectangle { // default size: whole image, unscaled width: Image.width height: Image.height diff --git a/examples/declarative/aspectratio/scale_to_fit.qml b/examples/declarative/aspectratio/scale_to_fit.qml index f6b14a4..744abce 100644 --- a/examples/declarative/aspectratio/scale_to_fit.qml +++ b/examples/declarative/aspectratio/scale_to_fit.qml @@ -3,7 +3,7 @@ import Qt 4.6 // Here, we implement "Scale to Fit" behaviour "manually", rather // than using the preserveAspect property. // -Rect { +Rectangle { // default size: whole image, unscaled width: Image.width height: Image.height diff --git a/examples/declarative/aspectratio/scale_to_fit_simple.qml b/examples/declarative/aspectratio/scale_to_fit_simple.qml index 5381bb4..4ee06ba 100644 --- a/examples/declarative/aspectratio/scale_to_fit_simple.qml +++ b/examples/declarative/aspectratio/scale_to_fit_simple.qml @@ -3,7 +3,7 @@ import Qt 4.6 // Here, we implement "Scale to Fit" behaviour, using the // preserveAspect property. // -Rect { +Rectangle { // default size: whole image, unscaled width: Image.width height: Image.height diff --git a/examples/declarative/behaviours/MyRect.qml b/examples/declarative/behaviours/MyRect.qml index 199b33b..fca1f70 100644 --- a/examples/declarative/behaviours/MyRect.qml +++ b/examples/declarative/behaviours/MyRect.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { radius: 15 border.color: "black" width: 100 diff --git a/examples/declarative/behaviours/test.qml b/examples/declarative/behaviours/test.qml index abf30c5..cac2f9d 100644 --- a/examples/declarative/behaviours/test.qml +++ b/examples/declarative/behaviours/test.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { color: "lightsteelblue" width: 800 height: 600 @@ -49,7 +49,7 @@ Rect { x: 400 y: 0 } - Rect { + Rectangle { color: "blue" x: 0 y: 0 diff --git a/examples/declarative/border-image/animated.qml b/examples/declarative/border-image/animated.qml index ce4de16..2fe2ea9 100644 --- a/examples/declarative/border-image/animated.qml +++ b/examples/declarative/border-image/animated.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: Page color: "white" width: 1030; height: 540 diff --git a/examples/declarative/border-image/borders.qml b/examples/declarative/border-image/borders.qml index e8c581e..73758f2 100644 --- a/examples/declarative/border-image/borders.qml +++ b/examples/declarative/border-image/borders.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: Page color: "white" width: 520; height: 280 diff --git a/examples/declarative/border-image/example.qml b/examples/declarative/border-image/example.qml index 10daf47..8f974e1 100644 --- a/examples/declarative/border-image/example.qml +++ b/examples/declarative/border-image/example.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: Page color: "white" width: 520; height: 280 diff --git a/examples/declarative/clock/Clock.qml b/examples/declarative/clock/Clock.qml index 30f0940..e152be3 100644 --- a/examples/declarative/clock/Clock.qml +++ b/examples/declarative/clock/Clock.qml @@ -69,7 +69,7 @@ Item { } } - Rect { + Rectangle { x: 93 y: 94 width: 11 diff --git a/examples/declarative/clock/display.qml b/examples/declarative/clock/display.qml index 00af9b3..59f4763 100644 --- a/examples/declarative/clock/display.qml +++ b/examples/declarative/clock/display.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { width: childrenRect.width height: childrenRect.height Clock { id: Clock } diff --git a/examples/declarative/connections/connections.qml b/examples/declarative/connections/connections.qml index 1f3d187..521cc01 100644 --- a/examples/declarative/connections/connections.qml +++ b/examples/declarative/connections/connections.qml @@ -1,11 +1,11 @@ import Qt 4.6 -Rect { +Rectangle { id: rect color: "blue" width: 40 height: 30 - Rect { + Rectangle { id: dot color: "red" width: 3 diff --git a/examples/declarative/dial/dial.qml b/examples/declarative/dial/dial.qml index 75bd65c..472ac66 100644 --- a/examples/declarative/dial/dial.qml +++ b/examples/declarative/dial/dial.qml @@ -1,14 +1,14 @@ import Qt 4.6 import "DialLibrary" -Rect { +Rectangle { color: "white" width: 210; height: 240 // Dial with a slider to adjust it Dial { id: Dial; value: Slider.x-2 } - Rect { + Rectangle { anchors.top: Dial.bottom x: 20; width: 160; height: 16 gradient: Gradient { @@ -16,7 +16,7 @@ Rect { GradientStop { position: 1.0; color: "lightsteelblue" } } radius: 8; opacity: 0.7; smooth: true - Rect { + Rectangle { id: Slider x: 2; y: 2; width: 30; height: 12 radius: 6; smooth: true diff --git a/examples/declarative/dynamic/DynRect.qml b/examples/declarative/dynamic/DynRect.qml index ec27441..fd03863 100644 --- a/examples/declarative/dynamic/DynRect.qml +++ b/examples/declarative/dynamic/DynRect.qml @@ -5,5 +5,5 @@ Item { transitions: Transition{ NumberAnimation{ properties: "opacity"; target: newRect; duration:500 } } - Rect {color: "steelblue"; width: 100; height: 100; id: newRect } + Rectangle {color: "steelblue"; width: 100; height: 100; id: newRect } } diff --git a/examples/declarative/dynamic/dynamic.qml b/examples/declarative/dynamic/dynamic.qml index 54d8dc8..6ea7ab8 100644 --- a/examples/declarative/dynamic/dynamic.qml +++ b/examples/declarative/dynamic/dynamic.qml @@ -1,17 +1,17 @@ import Qt 4.6 -Rect { id: page; width: 800; height: 800; color:"black" +Rectangle { id: page; width: 800; height: 800; color:"black" Script { source: "dynamic.js" } property bool extendStars: false; Item { id: targetItem; x: 100; y: 100; } Item { id: targetItem2; x: 0; y: 300; } - Rect { width: 100; height: 100; color: "green"; id: rect + Rectangle { width: 100; height: 100; color: "green"; id: rect MouseRegion { anchors.fill:parent; onClicked: {a = createWithComponent();}} } - Rect { width: 100; height: 100; color: "red"; id: rect2; y:100; + Rectangle { width: 100; height: 100; color: "red"; id: rect2; y:100; MouseRegion { anchors.fill:parent; onClicked: {destroyDynamicObject();}} } - Rect { width: 100; height: 100; color: "blue"; id: rect3; y:200; + Rectangle { width: 100; height: 100; color: "blue"; id: rect3; y:200; MouseRegion { anchors.fill:parent; onClicked: { if(fourthBox == null) { diff --git a/examples/declarative/easing/easing.qml b/examples/declarative/easing/easing.qml index 8089f16..f15b3fb 100644 --- a/examples/declarative/easing/easing.qml +++ b/examples/declarative/easing/easing.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: Window width: 640 height: Layout.height diff --git a/examples/declarative/fillmode/fillmode.qml b/examples/declarative/fillmode/fillmode.qml index 9e22885..de60b28 100644 --- a/examples/declarative/fillmode/fillmode.qml +++ b/examples/declarative/fillmode/fillmode.qml @@ -34,7 +34,7 @@ Image { styleColor: "white" anchors { centerIn: parent } } - Rect { + Rectangle { border.color: "black" color: "transparent" anchors { fill: parent; rightMargin: 1; bottomMargin: 1} diff --git a/examples/declarative/flowview/flickr.qml b/examples/declarative/flowview/flickr.qml index 2abf7a1..1cdb132 100644 --- a/examples/declarative/flowview/flickr.qml +++ b/examples/declarative/flowview/flickr.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { radius: 5; border.width: 1; width:400; @@ -34,7 +34,7 @@ Rect { model: FeedModel delegate: Item { width: 90; height: 86 - Rect { + Rectangle { anchors.centerIn: parent width: 86; height: 86; color: "white"; radius: 5 diff --git a/examples/declarative/flowview/flowview.qml b/examples/declarative/flowview/flowview.qml index 8d1bdf6..d40d378 100644 --- a/examples/declarative/flowview/flowview.qml +++ b/examples/declarative/flowview/flowview.qml @@ -1,11 +1,11 @@ import Qt 4.6 -Rect { +Rectangle { width: 800 height: 800 color: "black" - Rect { + Rectangle { id: MyPhone transformOrigin: "Center" anchors.centerIn: parent @@ -107,24 +107,24 @@ Rect { } } - Rect { + Rectangle { id: TopBar width: 800 height: 30 } - Rect { + Rectangle { id: BottomBar width: 800 height: 30 y: 450 } - Rect { + Rectangle { id: LeftBar x: -30 width: 30 height: 480 } - Rect { + Rectangle { id: RightBar x: 800 width: 30 @@ -132,7 +132,7 @@ Rect { } } - Rect { + Rectangle { width: 80 height: 80 anchors.right: parent.right diff --git a/examples/declarative/flowview/rect.qml b/examples/declarative/flowview/rect.qml index 3fecf17..7d2b58b 100644 --- a/examples/declarative/flowview/rect.qml +++ b/examples/declarative/flowview/rect.qml @@ -1,4 +1,4 @@ import Qt 4.6 -Rect { radius: 5; border.width: 1; width:400; height: 120; color: background; } +Rectangle { radius: 5; border.width: 1; width:400; height: 120; color: background; } diff --git a/examples/declarative/follow/follow.qml b/examples/declarative/follow/follow.qml index 59561b3..90bd7c8 100644 --- a/examples/declarative/follow/follow.qml +++ b/examples/declarative/follow/follow.qml @@ -1,9 +1,9 @@ import Qt 4.6 -Rect { +Rectangle { color: "#ffffff" width: 320; height: 240 - Rect { + Rectangle { id: Rect color: "#00ff00" y: 200; width: 60; height: 20 @@ -22,7 +22,7 @@ Rect { } // Velocity - Rect { + Rectangle { color: "#ff0000" x: Rect.width; width: Rect.width; height: 20 y: 200 @@ -31,13 +31,13 @@ Rect { Text { x: Rect.width; y: 220; text: "Velocity" } // Spring - Rect { + Rectangle { color: "#ff0000" x: Rect.width * 2; width: Rect.width/2; height: 20 y: 200 y: Follow { source: Rect.y; spring: 1.0; damping: 0.2 } } - Rect { + Rectangle { color: "#880000" x: Rect.width * 2.5; width: Rect.width/2; height: 20 y: 200 @@ -49,7 +49,7 @@ Rect { MouseRegion { id: Mouse anchors.fill: parent - Rect { + Rectangle { id: "Ball" width: 20; height: 20 radius: 10 diff --git a/examples/declarative/follow/pong.qml b/examples/declarative/follow/pong.qml index 2a430bf..6146f1a 100644 --- a/examples/declarative/follow/pong.qml +++ b/examples/declarative/follow/pong.qml @@ -1,12 +1,12 @@ import Qt 4.6 -Rect { +Rectangle { id: Page width: 640; height: 480 color: "#000000" // Make a ball to bounce - Rect { + Rectangle { // Add a property for the target y coordinate property var targetY : Page.height-10 property var direction : "right" @@ -38,7 +38,7 @@ Rect { // Place bats to the left and right of the view, following the y // coordinates of the ball. - Rect { + Rectangle { id: LeftBat color: "#00ee00" x: 2; width: 20; height: 90 @@ -47,7 +47,7 @@ Rect { enabled: Ball.direction == 'left' } } - Rect { + Rectangle { id: RightBat color: "#00ee00" x: Page.width-22; width: 20; height: 90 @@ -58,12 +58,12 @@ Rect { } // The rest, to make it look realistic, if neither ever scores... - Rect { color: "#00ee00"; x: Page.width/2-80; y: 0; width: 40; height: 60 } - Rect { color: "#000000"; x: Page.width/2-70; y: 10; width: 20; height: 40 } - Rect { color: "#00ee00"; x: Page.width/2+40; y: 0; width: 40; height: 60 } - Rect { color: "#000000"; x: Page.width/2+50; y: 10; width: 20; height: 40 } + Rectangle { color: "#00ee00"; x: Page.width/2-80; y: 0; width: 40; height: 60 } + Rectangle { color: "#000000"; x: Page.width/2-70; y: 10; width: 20; height: 40 } + Rectangle { color: "#00ee00"; x: Page.width/2+40; y: 0; width: 40; height: 60 } + Rectangle { color: "#000000"; x: Page.width/2+50; y: 10; width: 20; height: 40 } Repeater { dataSource: Page.height/20 - Rect { color: "#00ee00"; x: Page.width/2-5; y: index*20; width: 10; height: 10 } + Rectangle { color: "#00ee00"; x: Page.width/2-5; y: index*20; width: 10; height: 10 } } } diff --git a/examples/declarative/fonts/fonts.qml b/examples/declarative/fonts/fonts.qml index 578cffa..3620a00 100644 --- a/examples/declarative/fonts/fonts.qml +++ b/examples/declarative/fonts/fonts.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { property string myText: "Lorem ipsum dolor sit amet, consectetur adipisicing elit" width: 800; height: 600 diff --git a/examples/declarative/layouts/Button.qml b/examples/declarative/layouts/Button.qml index de11dc9..3f1aafc 100644 --- a/examples/declarative/layouts/Button.qml +++ b/examples/declarative/layouts/Button.qml @@ -1,5 +1,5 @@ import Qt 4.6 -Rect { border.color: "black"; color: "steelblue"; radius: 5; width: pix.width + text.width + 13; height: pix.height + 10; id: page +Rectangle { border.color: "black"; color: "steelblue"; radius: 5; width: pix.width + text.width + 13; height: pix.height + 10; id: page property string text property string icon signal clicked diff --git a/examples/declarative/layouts/layouts.qml b/examples/declarative/layouts/layouts.qml index 1f6b956..6e22d8b 100644 --- a/examples/declarative/layouts/layouts.qml +++ b/examples/declarative/layouts/layouts.qml @@ -11,13 +11,13 @@ Item { id: resizable minimumSize: "100x100" maximumSize: "300x300" preferredSize: "100x100" - Rect { color: "yellow"; anchors.fill: parent } + Rectangle { color: "yellow"; anchors.fill: parent } } LayoutItem{ minimumSize: "100x100" maximumSize: "400x400" preferredSize: "200x200" - Rect { color: "green"; anchors.fill: parent } + Rectangle { color: "green"; anchors.fill: parent } } } } diff --git a/examples/declarative/layouts/positioners.qml b/examples/declarative/layouts/positioners.qml index 44f9509..add46a4 100644 --- a/examples/declarative/layouts/positioners.qml +++ b/examples/declarative/layouts/positioners.qml @@ -1,18 +1,18 @@ import Qt 4.6 -Rect { width: 420; height: 420; id:page; color:"white" +Rectangle { width: 420; height: 420; id:page; color:"white" VerticalPositioner { id: layout1; y:0; //width: 100; height:250; move: Transition{ NumberAnimation {properties: "y"; easing: "easeOutBounce" }} add: Transition{ NumberAnimation { properties: "y"; from: 500; duration:500; easing: "easeOutQuad"}} remove: Transition { NumberAnimation { properties:"y"; to: 500; duration:500; easing: "easeInQuad"}} - Rect { color: "red"; width: 100; height: 50; border.color: "black"; radius: 15 } - Rect { id: blueV1; color: "lightsteelblue"; width: 100; height: 50; border.color: "black"; radius: 15 + Rectangle { color: "red"; width: 100; height: 50; border.color: "black"; radius: 15 } + Rectangle { id: blueV1; color: "lightsteelblue"; width: 100; height: 50; border.color: "black"; radius: 15 //opacity: Behavior{ NumberAnimation {}} } - Rect { color: "green"; width: 100; height: 50; border.color: "black"; radius: 15 } - Rect { id: blueV2; color: "lightsteelblue"; width: 100; height: 50; border.color: "black"; radius: 15 + Rectangle { color: "green"; width: 100; height: 50; border.color: "black"; radius: 15 } + Rectangle { id: blueV2; color: "lightsteelblue"; width: 100; height: 50; border.color: "black"; radius: 15 //opacity: Behavior{ NumberAnimation {}} } - Rect { color: "orange"; width: 100; height: 50; border.color: "black"; radius: 15 } + Rectangle { color: "orange"; width: 100; height: 50; border.color: "black"; radius: 15 } } HorizontalPositioner { id: layout2; y:300; move: Transition{ NumberAnimation {properties: "x"; easing: "easeOutBounce" }} @@ -20,11 +20,11 @@ Rect { width: 420; height: 420; id:page; color:"white" NumberAnimation { properties: "opacity"; from: 0; duration: 500;}} remove: Transition { NumberAnimation { properties: "x"; to: 500; duration:500; easing: "easeInQuad"} NumberAnimation { properties: "opacity"; from: 1; duration: 500}} - Rect { color: "red"; width: 50; height: 100; border.color: "black"; radius: 15 } - Rect { id: blueH1; color: "lightsteelblue"; width: 50; height: 100; border.color: "black"; radius: 15 } - Rect { color: "green"; width: 50; height: 100; border.color: "black"; radius: 15 } - Rect { id: blueH2; color: "lightsteelblue"; width: 50; height: 100; border.color: "black"; radius: 15 } - Rect { color: "orange"; width: 50; height: 100; border.color: "black"; radius: 15 } + Rectangle { color: "red"; width: 50; height: 100; border.color: "black"; radius: 15 } + Rectangle { id: blueH1; color: "lightsteelblue"; width: 50; height: 100; border.color: "black"; radius: 15 } + Rectangle { color: "green"; width: 50; height: 100; border.color: "black"; radius: 15 } + Rectangle { id: blueH2; color: "lightsteelblue"; width: 50; height: 100; border.color: "black"; radius: 15 } + Rectangle { color: "orange"; width: 50; height: 100; border.color: "black"; radius: 15 } } Button { text: "Remove"; icon: "del.png"; x: 135; y:90; onClicked: {blueH2.opacity=0; blueH1.opacity=0; blueV1.opacity=0; blueV2.opacity=0; blueG1.opacity=0; blueG2.opacity=0; blueG3.opacity=0;} @@ -38,14 +38,14 @@ Rect { width: 420; height: 420; id:page; color:"white" move: Transition { NumberAnimation{ properties: "x,y"; easing: "easeOutBounce" }} add: Transition { NumberAnimation{ properties: "opacity"; from: 0; to: 1; duration: 500} NumberAnimation{properties: "x,y"; easing: "easeOutBounce"} } - Rect { color: "red"; width: 50; height: 100; border.color: "black"; radius: 15 } - Rect { id: blueG1; color: "lightsteelblue"; width: 50; height: 100; border.color: "black"; radius: 15 } - Rect { color: "green"; width: 50; height: 100; border.color: "black"; radius: 15 } - Rect { id: blueG2; color: "lightsteelblue"; width: 50; height: 100; border.color: "black"; radius: 15 } - Rect { color: "orange"; width: 50; height: 100; border.color: "black"; radius: 15 } - Rect { id: blueG3; color: "lightsteelblue"; width: 50; height: 100; border.color: "black"; radius: 15 } - Rect { color: "red"; width: 50; height: 100; border.color: "black"; radius: 15 } - Rect { color: "green"; width: 50; height: 100; border.color: "black"; radius: 15 } - Rect { color: "orange"; width: 50; height: 100; border.color: "black"; radius: 15 } + Rectangle { color: "red"; width: 50; height: 100; border.color: "black"; radius: 15 } + Rectangle { id: blueG1; color: "lightsteelblue"; width: 50; height: 100; border.color: "black"; radius: 15 } + Rectangle { color: "green"; width: 50; height: 100; border.color: "black"; radius: 15 } + Rectangle { id: blueG2; color: "lightsteelblue"; width: 50; height: 100; border.color: "black"; radius: 15 } + Rectangle { color: "orange"; width: 50; height: 100; border.color: "black"; radius: 15 } + Rectangle { id: blueG3; color: "lightsteelblue"; width: 50; height: 100; border.color: "black"; radius: 15 } + Rectangle { color: "red"; width: 50; height: 100; border.color: "black"; radius: 15 } + Rectangle { color: "green"; width: 50; height: 100; border.color: "black"; radius: 15 } + Rectangle { color: "orange"; width: 50; height: 100; border.color: "black"; radius: 15 } } } diff --git a/examples/declarative/listview/highlight.qml b/examples/declarative/listview/highlight.qml index ea9feb0..b1cd6be 100644 --- a/examples/declarative/listview/highlight.qml +++ b/examples/declarative/listview/highlight.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { width: 400; height: 300; color: "white" // MyPets model is defined in dummydata/MyPetsModel.qml @@ -42,7 +42,7 @@ Rect { // highlight moves to the current item. Component { id: PetHighlight - Rect { + Rectangle { width: 200; height: 50; color: "#FFFF88" y: Follow { source: List1.current.y; spring: 3; damping: 0.1 } } diff --git a/examples/declarative/listview/itemlist.qml b/examples/declarative/listview/itemlist.qml index 4b81614..bf1184f 100644 --- a/examples/declarative/listview/itemlist.qml +++ b/examples/declarative/listview/itemlist.qml @@ -3,22 +3,22 @@ import Qt 4.6 -Rect { +Rectangle { color: "lightgray" width: 240 height: 320 VisualItemModel { id: ItemModel - Rect { + Rectangle { height: View.height; width: View.width; color: "#FFFEF0" Text { text: "Page 1"; font.bold: true; anchors.centerIn: parent } } - Rect { + Rectangle { height: View.height; width: View.width; color: "#F0FFF7" Text { text: "Page 2"; font.bold: true; anchors.centerIn: parent } } - Rect { + Rectangle { height: View.height; width: View.width; color: "#F4F0FF" Text { text: "Page 3"; font.bold: true; anchors.centerIn: parent } } @@ -33,7 +33,7 @@ Rect { orientation: "Horizontal" } - Rect { + Rectangle { color: "gray" anchors.top: View.bottom anchors.bottom: parent.bottom @@ -45,7 +45,7 @@ Rect { spacing: 20 Repeater { dataSource: ItemModel.count - Rect { + Rectangle { width: 5; height: 5 radius: 3 MouseRegion { width: 20; height: 20; anchors.centerIn: parent; onClicked: View.currentIndex = index } diff --git a/examples/declarative/listview/listview.qml b/examples/declarative/listview/listview.qml index 6b8d3d6..1e2de65 100644 --- a/examples/declarative/listview/listview.qml +++ b/examples/declarative/listview/listview.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { width: 600; height: 300; color: "white" // MyPets model is defined in dummydata/MyPetsModel.qml @@ -26,7 +26,7 @@ Rect { // by each ListView and placed behind the current item. Component { id: PetHighlight - Rect { color: "#FFFF88" } + Rectangle { color: "#FFFF88" } } // Show the model in three lists, with different currentItemPositioning. @@ -73,7 +73,7 @@ Rect { // the item under the highlight will always be the current item. // Note that we specify the 'children' property. This is because // the default property of a ListView is 'delegate'. - Rect { + Rectangle { y: 125; width: 200; height: 50 color: "#FFFF88"; z: -1 } diff --git a/examples/declarative/listview/recipes.qml b/examples/declarative/listview/recipes.qml index b2c17af..34cdee5 100644 --- a/examples/declarative/listview/recipes.qml +++ b/examples/declarative/listview/recipes.qml @@ -2,7 +2,7 @@ import Qt 4.6 import "content" // This example illustrates expanding a list item to show a more detailed view -Rect { +Rectangle { id: page width: 400; height: 240; color: "black" resources: [ @@ -21,7 +21,7 @@ Rect { property real detailsOpacity : 0 // A simple rounded rectangle for the background - Rect { + Rectangle { id: background x: 1; y: 2; width: parent.width-2; height: parent.height-4 color: "#FEFFEE"; border.color: "#FFBE4F"; radius: 5 diff --git a/examples/declarative/listview/sections.qml b/examples/declarative/listview/sections.qml index 41cc2e6..1b51a43 100644 --- a/examples/declarative/listview/sections.qml +++ b/examples/declarative/listview/sections.qml @@ -1,7 +1,7 @@ import Qt 4.6 //! [0] -Rect { +Rectangle { width: 200 height: 240 color: "white" @@ -18,7 +18,7 @@ Rect { width: 200 // My height is the combined height of the description and the section separator height: Separator.height + Desc.height - Rect { + Rectangle { id: Separator color: "lightsteelblue" width: parent.width @@ -50,7 +50,7 @@ Rect { // by each ListView and placed behind the current item. Component { id: PetHighlight - Rect { + Rectangle { color: "#FFFF88" } } diff --git a/examples/declarative/loader/Browser.qml b/examples/declarative/loader/Browser.qml index 78b26dc..d3566da 100644 --- a/examples/declarative/loader/Browser.qml +++ b/examples/declarative/loader/Browser.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: Root width: parent.width height: parent.height @@ -15,7 +15,7 @@ Rect { Component { id: FolderDelegate - Rect { + Rectangle { id: Wrapper function launch() { if (folders.isFolder(index)) { @@ -27,7 +27,7 @@ Rect { width: Root.width height: 32 color: "transparent" - Rect { + Rectangle { id: Highlight; visible: false anchors.fill: parent gradient: Gradient { @@ -77,7 +77,7 @@ Rect { anchors.bottom: parent.bottom model: folders delegate: FolderDelegate - highlight: Rect { color: "#FFFBAF" } + highlight: Rectangle { color: "#FFFBAF" } clip: true focus: true Keys.onPressed: { @@ -88,13 +88,13 @@ Rect { } } - Rect { + Rectangle { id: TitleBar width: parent.width height: 32 color: activePalette.button; border.color: activePalette.mid - Rect { + Rectangle { id: UpButton width: 30 height: TitleBar.height diff --git a/examples/declarative/loader/Button.qml b/examples/declarative/loader/Button.qml index 391a800..d01a658 100644 --- a/examples/declarative/loader/Button.qml +++ b/examples/declarative/loader/Button.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: Container property var text diff --git a/examples/declarative/loader/loader.qml b/examples/declarative/loader/loader.qml index f507651..319db84 100644 --- a/examples/declarative/loader/loader.qml +++ b/examples/declarative/loader/loader.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { width: 300 height: 400 Loader { diff --git a/examples/declarative/minehunt/Description.qml b/examples/declarative/minehunt/Description.qml index 2bc182f..df4881c 100644 --- a/examples/declarative/minehunt/Description.qml +++ b/examples/declarative/minehunt/Description.qml @@ -13,7 +13,7 @@ Item { drag.minimumY: 0 drag.maximumY: 1000 } - Rect { + Rectangle { radius: 10 anchors.fill: parent color: "lightsteelblue" diff --git a/examples/declarative/modules/builtin-version.qml b/examples/declarative/modules/builtin-version.qml index 69f64ed..4aa63be 100644 --- a/examples/declarative/modules/builtin-version.qml +++ b/examples/declarative/modules/builtin-version.qml @@ -1,3 +1,3 @@ import Qt 4.6 -Rect {} +Rectangle {} diff --git a/examples/declarative/modules/wrong-installed.qml b/examples/declarative/modules/wrong-installed.qml index 40cd9c5..317c05c 100644 --- a/examples/declarative/modules/wrong-installed.qml +++ b/examples/declarative/modules/wrong-installed.qml @@ -2,4 +2,4 @@ import Qt 4.6 import com.nokia.NonExistent -Rect {} +Rectangle {} diff --git a/examples/declarative/mouseregion/mouse.qml b/examples/declarative/mouseregion/mouse.qml index 0cb8bb9..18378ae 100644 --- a/examples/declarative/mouseregion/mouse.qml +++ b/examples/declarative/mouseregion/mouse.qml @@ -1,9 +1,9 @@ import Qt 4.6 -Rect { +Rectangle { color: "white" width: 200; height: 200 - Rect { + Rectangle { width: 50; height: 50 color: "red" Text { text: "Click"; anchors.centerIn: parent } @@ -19,7 +19,7 @@ Rect { anchors.fill: parent } } - Rect { + Rectangle { y: 100; width: 50; height: 50 color: "blue" Text { text: "Drag"; anchors.centerIn: parent } diff --git a/examples/declarative/scrollbar/ScrollBar.qml b/examples/declarative/scrollbar/ScrollBar.qml index 84dbfd9..c1c4a4f 100644 --- a/examples/declarative/scrollbar/ScrollBar.qml +++ b/examples/declarative/scrollbar/ScrollBar.qml @@ -12,14 +12,14 @@ Item { property var orientation : "Vertical" // A light, semi-transparent background - Rect { + Rectangle { id: Background radius: orientation == 'Vertical' ? (width/2 - 1) : (height/2 - 1) color: "white"; opacity: 0.3 anchors.fill: parent } // Size the bar to the required size, depending upon the orientation. - Rect { + Rectangle { opacity: 0.7 color: "black" radius: orientation == 'Vertical' ? (width/2 - 1) : (height/2 - 1) diff --git a/examples/declarative/scrollbar/display.qml b/examples/declarative/scrollbar/display.qml index d8bd187..1359c4b 100644 --- a/examples/declarative/scrollbar/display.qml +++ b/examples/declarative/scrollbar/display.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { width: 640 height: 480 // Create a flickable to view a large image. diff --git a/examples/declarative/slideswitch/display.qml b/examples/declarative/slideswitch/display.qml index bd9b122..346ffb1 100644 --- a/examples/declarative/slideswitch/display.qml +++ b/examples/declarative/slideswitch/display.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { color: "white" width: 150 height: 150 diff --git a/examples/declarative/smooth/GradientRect.qml b/examples/declarative/smooth/GradientRect.qml index 267a487..c4a287c 100644 --- a/examples/declarative/smooth/GradientRect.qml +++ b/examples/declarative/smooth/GradientRect.qml @@ -12,7 +12,7 @@ Item { width: 80; height: 80 Item { anchors.centerIn: parent; rotation: MyRect.rotation; - Rect { + Rectangle { anchors.centerIn: parent; width: 80; height: 80 border.color: MyRect.border; border.width: MyRect.border != "" ? 2 : 0 radius: MyRect.radius; smooth: MyRect.smooth diff --git a/examples/declarative/smooth/MyRect.qml b/examples/declarative/smooth/MyRect.qml index 7791e27..3b68307 100644 --- a/examples/declarative/smooth/MyRect.qml +++ b/examples/declarative/smooth/MyRect.qml @@ -12,7 +12,7 @@ Item { width: 80; height: 80 Item { anchors.centerIn: parent; rotation: MyRect.rotation; - Rect { + Rectangle { anchors.centerIn: parent; width: 80; height: 80 color: MyRect.color; border.color: MyRect.border; border.width: MyRect.border != "" ? 2 : 0 radius: MyRect.radius; smooth: MyRect.smooth diff --git a/examples/declarative/smooth/rect-painting.qml b/examples/declarative/smooth/rect-painting.qml index ba6c16f..0f3eb6e 100644 --- a/examples/declarative/smooth/rect-painting.qml +++ b/examples/declarative/smooth/rect-painting.qml @@ -1,10 +1,10 @@ import Qt 4.6 -Rect { +Rectangle { width: 900; height: 500 color: "white" - Rect { + Rectangle { anchors.top: parent.verticalCenter anchors.left: parent.left anchors.right: parent.right diff --git a/examples/declarative/snow/snow.qml b/examples/declarative/snow/snow.qml index ea6a09e..985f913 100644 --- a/examples/declarative/snow/snow.qml +++ b/examples/declarative/snow/snow.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: ImagePanel width: 1024 height: 768 diff --git a/examples/declarative/states/states.qml b/examples/declarative/states/states.qml index c4c71b5..2dcf804 100644 --- a/examples/declarative/states/states.qml +++ b/examples/declarative/states/states.qml @@ -1,28 +1,28 @@ import Qt 4.6 -Rect { +Rectangle { id: Page width: 300; height: 300; color: "white" // A target region. Clicking in here sets the state to '' - the default state - Rect { + Rectangle { x: 0; y: 0; width: 50; height: 50 color: "transparent"; border.color: "black" MouseRegion { anchors.fill: parent; onClicked: { Page.state='' } } } // Another target region. Clicking in here sets the state to 'Position1' - Rect { + Rectangle { x: 150; y: 50; width: 50; height: 50 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 { + Rectangle { x: 0; y: 200; width: 50; height: 50 color: "transparent"; border.color: "black" MouseRegion { anchors.fill: parent; onClicked: { Page.state='Position2' } } } // Rect which will be moved when my state changes - Rect { id: myrect; width: 50; height: 50; color: "red" } + Rectangle { id: myrect; width: 50; height: 50; color: "red" } states: [ // In state 'Position1', change the 'myrect' item x, y to 150, 50. diff --git a/examples/declarative/states/transitions.qml b/examples/declarative/states/transitions.qml index 63ed4d9..15c2336 100644 --- a/examples/declarative/states/transitions.qml +++ b/examples/declarative/states/transitions.qml @@ -1,28 +1,28 @@ import Qt 4.6 -Rect { +Rectangle { id: Page width: 300; height: 300; color: "white" // A target region. Clicking in here sets the state to '' - the default state - Rect { + Rectangle { x: 0; y: 0; width: 50; height: 50 color: "transparent"; border.color: "black" MouseRegion { anchors.fill: parent; onClicked: { Page.state='' } } } // Another target region. Clicking in here sets the state to 'Position1' - Rect { + Rectangle { x: 150; y: 50; width: 50; height: 50 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 { + Rectangle { x: 0; y: 200; width: 50; height: 50 color: "transparent"; border.color: "black" MouseRegion { anchors.fill: parent; onClicked: { Page.state='Position2' } } } // Rect which will be moved when my state changes - Rect { id: myrect; width: 50; height: 50; color: "red" } + Rectangle { id: myrect; width: 50; height: 50; color: "red" } states: [ // In state 'Position1', change the 'myrect' item x, y to 150, 50. diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1/Removebutton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1/Removebutton.qml index fcfb082..a8ac7fe 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1/Removebutton.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1/Removebutton.qml @@ -1,7 +1,7 @@ import Qt 4.6 //! [0] -Rect { +Rectangle { id: removeButton width: 30 height: 30 diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1_Drawing_and_animation.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1_Drawing_and_animation.qml index 1087d6a..ecc5635 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1_Drawing_and_animation.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1_Drawing_and_animation.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: page width: layout.width height: layout.height diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/2/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/2/RemoveButton.qml index dc5a486..e323381 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/2/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/2/RemoveButton.qml @@ -1,7 +1,7 @@ import Qt 4.6 //! [0] -Rect { +Rectangle { id: removeButton width: 30 height: 30 diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/2a/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/2a/RemoveButton.qml index f60bc9b..acada5b 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/2a/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/2a/RemoveButton.qml @@ -1,7 +1,7 @@ import Qt 4.6 //! [0] -Rect { +Rectangle { id: removeButton width: 30 height: 30 diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/3/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/3/RemoveButton.qml index f1b72ab..247d266 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/3/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/3/RemoveButton.qml @@ -1,7 +1,7 @@ import Qt 4.6 //! [0] -Rect { +Rectangle { id: removeButton width: 230 height: 30 diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4/RemoveButton.qml index dfb79a6..6ceec91 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4/RemoveButton.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: removeButton width: 30 height: 30 diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4a/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4a/RemoveButton.qml index d4f30eb..6ddb770 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4a/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4a/RemoveButton.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: removeButton width: 30 height: 30 diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml index 292eb45..d712c7a 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: removeButton width: 30 height: 30 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 c607e75..327c2bf 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/GroupBox.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/GroupBox.qml @@ -8,7 +8,7 @@ FocusScope { property var contents property var label - Rect { + Rectangle { id: wrapper x: 5 y: 10 @@ -28,7 +28,7 @@ FocusScope { height: item.height } } - Rect { + Rectangle { x: 20 y: 0 height: text.height @@ -41,7 +41,7 @@ FocusScope { font.bold: true } } - Rect { + Rectangle { color: "black" anchors.fill: parent opacity: parent.focus ? 0 : 0.3 diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml index f74ff99..960b007 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: removeButton width: 30 height: 30 diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml index f74ff99..960b007 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: removeButton width: 30 height: 30 diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1b/BlueRect.qml b/examples/declarative/tutorials/contacts/2_Reuse/1b/BlueRect.qml index a68adc1..ec115fe 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/1b/BlueRect.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/1b/BlueRect.qml @@ -1,14 +1,14 @@ import Qt 4.6 //! [all] -Rect { +Rectangle { width: 100 height: 100 color: "blue" resources: [ Component { id: redRectangle - Rect { + Rectangle { width: 30 height: 30 color: "red" diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml index d21b297..e7a37c2 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: removeButton width: 30 height: 30 diff --git a/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml index 9a7e0d7..affa24a 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml @@ -1,7 +1,7 @@ import Qt 4.6 //! [define properties and signals] -Rect { +Rectangle { id: removeButton width: 30 height: 30 diff --git a/examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml b/examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml index 70b8b95..885a3a1 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: page width: layout.width height: layout.height diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml index 3130bbe..77952eb 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml @@ -1,7 +1,7 @@ import Qt 4.6 //! [value change] -Rect { +Rectangle { id: fieldText height: 30 radius: 5 diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml index b99ab84..66ab36e 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml @@ -1,7 +1,7 @@ import Qt 4.6 //! [all] -Rect { +Rectangle { id: removeButton width: 30 height: 30 diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml index 369d34d..f211213 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: fieldText height: 30 radius: 5 diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml index f4a55e1..ed60d00 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: removeButton width: 30 height: 30 diff --git a/examples/declarative/tutorials/contacts/2_Reuse/GroupBox.qml b/examples/declarative/tutorials/contacts/2_Reuse/GroupBox.qml index c607e75..327c2bf 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/GroupBox.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/GroupBox.qml @@ -8,7 +8,7 @@ FocusScope { property var contents property var label - Rect { + Rectangle { id: wrapper x: 5 y: 10 @@ -28,7 +28,7 @@ FocusScope { height: item.height } } - Rect { + Rectangle { x: 20 y: 0 height: text.height @@ -41,7 +41,7 @@ FocusScope { font.bold: true } } - Rect { + Rectangle { color: "black" anchors.fill: parent opacity: parent.focus ? 0 : 0.3 diff --git a/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml b/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml index 5a22b1c..4cc16a4 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: page width: layout.width height: layout.height diff --git a/examples/declarative/tutorials/contacts/3_Collections/GroupBox.qml b/examples/declarative/tutorials/contacts/3_Collections/GroupBox.qml index c607e75..327c2bf 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/GroupBox.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/GroupBox.qml @@ -8,7 +8,7 @@ FocusScope { property var contents property var label - Rect { + Rectangle { id: wrapper x: 5 y: 10 @@ -28,7 +28,7 @@ FocusScope { height: item.height } } - Rect { + Rectangle { x: 20 y: 0 height: text.height @@ -41,7 +41,7 @@ FocusScope { font.bold: true } } - Rect { + Rectangle { color: "black" anchors.fill: parent opacity: parent.focus ? 0 : 0.3 diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml index f5024e5..bdfc22e 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml @@ -6,7 +6,7 @@ Item { height: 30 property var icon: "" signal clicked - Rect { + Rectangle { id: buttonRect anchors.fill: parent color: "lightgreen" diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml index 93ac0f8..0dc0bf9 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: fieldText height: 30 radius: 5 diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml index d96a932..af878b4 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: removeButton width: 30 height: 30 diff --git a/examples/declarative/tutorials/helloworld/t1/tutorial1.qml b/examples/declarative/tutorials/helloworld/t1/tutorial1.qml index 156655a..f09dcd1 100644 --- a/examples/declarative/tutorials/helloworld/t1/tutorial1.qml +++ b/examples/declarative/tutorials/helloworld/t1/tutorial1.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: Page width: 480 height: 200 diff --git a/examples/declarative/tutorials/helloworld/t2/Cell.qml b/examples/declarative/tutorials/helloworld/t2/Cell.qml index 0b8ae3f..b3c52b7 100644 --- a/examples/declarative/tutorials/helloworld/t2/Cell.qml +++ b/examples/declarative/tutorials/helloworld/t2/Cell.qml @@ -7,7 +7,7 @@ Item { width: 40 height: 25 - Rect { + Rectangle { anchors.fill: parent color: CellContainer.color } diff --git a/examples/declarative/tutorials/helloworld/t2/tutorial2.qml b/examples/declarative/tutorials/helloworld/t2/tutorial2.qml index 5619d04..32e9369 100644 --- a/examples/declarative/tutorials/helloworld/t2/tutorial2.qml +++ b/examples/declarative/tutorials/helloworld/t2/tutorial2.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: Page width: 480 height: 200 diff --git a/examples/declarative/tutorials/helloworld/t3/Cell.qml b/examples/declarative/tutorials/helloworld/t3/Cell.qml index 460d569..4b1a220 100644 --- a/examples/declarative/tutorials/helloworld/t3/Cell.qml +++ b/examples/declarative/tutorials/helloworld/t3/Cell.qml @@ -6,7 +6,7 @@ Item { id: CellContainer width: 40 height: 25 - Rect { + Rectangle { anchors.fill: parent color: CellContainer.color } diff --git a/examples/declarative/tutorials/helloworld/t3/tutorial3.qml b/examples/declarative/tutorials/helloworld/t3/tutorial3.qml index ca32709..bab9f86 100644 --- a/examples/declarative/tutorials/helloworld/t3/tutorial3.qml +++ b/examples/declarative/tutorials/helloworld/t3/tutorial3.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: Page width: 480 height: 200 diff --git a/examples/declarative/velocity/Day.qml b/examples/declarative/velocity/Day.qml index d67eabe..f3f13fa 100644 --- a/examples/declarative/velocity/Day.qml +++ b/examples/declarative/velocity/Day.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { property string day property var stickies diff --git a/examples/declarative/velocity/velocity.qml b/examples/declarative/velocity/velocity.qml index f609537..088532e 100644 --- a/examples/declarative/velocity/velocity.qml +++ b/examples/declarative/velocity/velocity.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { color: "lightSteelBlue" width: 800 height: 600 diff --git a/examples/declarative/webview/autosize.qml b/examples/declarative/webview/autosize.qml index d8e2063..0099f37 100644 --- a/examples/declarative/webview/autosize.qml +++ b/examples/declarative/webview/autosize.qml @@ -2,7 +2,7 @@ import Qt 4.6 // The WebView size is determined by the width, height, // idealWidth, and idealHeight properties. -Rect { +Rectangle { id: Rect color: "white" width: 200 @@ -12,7 +12,7 @@ Rect { spacing: 2 WebView { html: "No width defined." - Rect { + Rectangle { color: "#10000000" anchors.fill: parent } @@ -20,7 +20,7 @@ Rect { WebView { width: Rect.width html: "The width is full." - Rect { + Rectangle { color: "#10000000" anchors.fill: parent } @@ -28,7 +28,7 @@ Rect { WebView { width: Rect.width/2 html: "The width is half." - Rect { + Rectangle { color: "#10000000" anchors.fill: parent } @@ -36,7 +36,7 @@ Rect { WebView { idealWidth: Rect.width/2 html: "The idealWidth is half." - Rect { + Rectangle { color: "#10000000" anchors.fill: parent } @@ -44,7 +44,7 @@ Rect { WebView { idealWidth: Rect.width/2 html: "The_idealWidth_is_half." - Rect { + Rectangle { color: "#10000000" anchors.fill: parent } @@ -52,7 +52,7 @@ Rect { WebView { width: Rect.width/2 html: "The_width_is_half." - Rect { + Rectangle { color: "#10000000" anchors.fill: parent } diff --git a/examples/declarative/webview/content/SpinSquare.qml b/examples/declarative/webview/content/SpinSquare.qml index 63336ef..57ad697 100644 --- a/examples/declarative/webview/content/SpinSquare.qml +++ b/examples/declarative/webview/content/SpinSquare.qml @@ -8,7 +8,7 @@ Item { Item { x: Root.width/2 y: Root.height/2 - Rect { + Rectangle { color: Root.color x: -width/2 y: -height/2 diff --git a/examples/declarative/webview/qml-in-html.qml b/examples/declarative/webview/qml-in-html.qml index 2ae3476..b9c8d94 100644 --- a/examples/declarative/webview/qml-in-html.qml +++ b/examples/declarative/webview/qml-in-html.qml @@ -1,7 +1,7 @@ import Qt 4.6 // The WebView supports QML data through the HTML OBJECT tag -Rect { +Rectangle { color:"blue" Flickable { width: parent.width diff --git a/examples/declarative/webview/transparent.qml b/examples/declarative/webview/transparent.qml index c23b5f5..0807cc5 100644 --- a/examples/declarative/webview/transparent.qml +++ b/examples/declarative/webview/transparent.qml @@ -2,7 +2,7 @@ import Qt 4.6 // The WebView background is transparent // if the HTML does not specify a background -Rect { +Rectangle { color: "green" width: Web.width height: Web.height diff --git a/examples/declarative/xmldata/daringfireball.qml b/examples/declarative/xmldata/daringfireball.qml index a93483e..e0e53ef 100644 --- a/examples/declarative/xmldata/daringfireball.qml +++ b/examples/declarative/xmldata/daringfireball.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { color: "white" width: 600 height: 600 diff --git a/examples/declarative/xmldata/yahoonews.qml b/examples/declarative/xmldata/yahoonews.qml index 22586b8..d170dac 100644 --- a/examples/declarative/xmldata/yahoonews.qml +++ b/examples/declarative/xmldata/yahoonews.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { gradient: Gradient { GradientStop { position: 0; color: "black" } GradientStop { position: 1.0; color: "#AAAAAA" } @@ -35,7 +35,7 @@ Rect { onPressed: { Delegate.ListView.list.currentIndex = index; } onClicked: { if (Wrapper.state == 'Details') { Wrapper.state = '';} else {Wrapper.state = 'Details';} } } - Rect { + Rectangle { id: Wrapper y: 5 height: TitleText.height + 10 |