diff options
147 files changed, 448 insertions, 448 deletions
diff --git a/demos/declarative/calculator/CalcButton.qml b/demos/declarative/calculator/CalcButton.qml index ebb1967..04dbfc9 100644 --- a/demos/declarative/calculator/CalcButton.qml +++ b/demos/declarative/calculator/CalcButton.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { property string operation property bool toggable : false property bool toggled : false diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml index 56bdc4d..56fdc59 100644 --- a/demos/declarative/calculator/calculator.qml +++ b/demos/declarative/calculator/calculator.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: MainWindow; width: 320; height: 270; color: Palette.window @@ -10,7 +10,7 @@ Rect { VerticalPositioner { x: 2; spacing: 10; - Rect { + Rectangle { id: Container width: 316; height: 50; z: 2 border.color: Palette.dark; color: Palette.base diff --git a/demos/declarative/contacts/Button.qml b/demos/declarative/contacts/Button.qml index f5024e5..bdfc22e 100644 --- a/demos/declarative/contacts/Button.qml +++ b/demos/declarative/contacts/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/demos/declarative/contacts/FieldText.qml b/demos/declarative/contacts/FieldText.qml index 392d9aa..95805f7 100644 --- a/demos/declarative/contacts/FieldText.qml +++ b/demos/declarative/contacts/FieldText.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: fieldText height: 30 radius: 5 diff --git a/demos/declarative/contacts/RemoveButton.qml b/demos/declarative/contacts/RemoveButton.qml index c13b412..b01d89f 100644 --- a/demos/declarative/contacts/RemoveButton.qml +++ b/demos/declarative/contacts/RemoveButton.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: removeButton width: 30 height: 30 diff --git a/demos/declarative/contacts/SearchBar.qml b/demos/declarative/contacts/SearchBar.qml index b3faa9d..b326fd3 100644 --- a/demos/declarative/contacts/SearchBar.qml +++ b/demos/declarative/contacts/SearchBar.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: searchBar color: "white" property var text: searchEdit.text diff --git a/demos/declarative/contacts/contacts.qml b/demos/declarative/contacts/contacts.qml index 353040c..8410ac1 100644 --- a/demos/declarative/contacts/contacts.qml +++ b/demos/declarative/contacts/contacts.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: contacts width: 240 height: 320 @@ -211,7 +211,7 @@ Rect { model: contactList delegate: contactDelegate highlight: [ - Rect { + Rectangle { id: contactHighlight border.width: 0 color: 'white' diff --git a/demos/declarative/flickr/content/ImageDetails.qml b/demos/declarative/flickr/content/ImageDetails.qml index 09d8f03..bfa3e01 100644 --- a/demos/declarative/flickr/content/ImageDetails.qml +++ b/demos/declarative/flickr/content/ImageDetails.qml @@ -27,7 +27,7 @@ Flipable { front: Item { id: ContainerFront; anchors.fill: Container - Rect { + Rectangle { anchors.fill: parent color: "black"; opacity: 0.4 border.color: "white"; border.width: 2 @@ -77,7 +77,7 @@ Flipable { back: Item { anchors.fill: Container - Rect { anchors.fill: parent; color: "black"; opacity: 0.4; border.color: "white"; border.width: 2 } + Rectangle { 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!=1 } Flickable { diff --git a/demos/declarative/flickr/content/Progress.qml b/demos/declarative/flickr/content/Progress.qml index 4268963..00ef901 100644 --- a/demos/declarative/flickr/content/Progress.qml +++ b/demos/declarative/flickr/content/Progress.qml @@ -5,7 +5,7 @@ Item { property var progress: 0 - Rect { + Rectangle { id: Container; anchors.fill: parent; smooth: true border.color: "white"; border.width: 0; radius: height/2 - 2 gradient: Gradient { @@ -14,7 +14,7 @@ Item { } } - Rect { + Rectangle { id: Fill y: 2; height: parent.height-4; x: 2; width: Math.max(parent.width * progress - 4, 0); diff --git a/demos/declarative/flickr/content/ScrollBar.qml b/demos/declarative/flickr/content/ScrollBar.qml index e9a461c..9c78326 100644 --- a/demos/declarative/flickr/content/ScrollBar.qml +++ b/demos/declarative/flickr/content/ScrollBar.qml @@ -5,7 +5,7 @@ Item { property var flickableArea - Rect { + Rectangle { radius: 5 color: "black" opacity: 0.3 diff --git a/demos/declarative/flickr/content/Slider.qml b/demos/declarative/flickr/content/Slider.qml index 24f6f90..b88636d 100644 --- a/demos/declarative/flickr/content/Slider.qml +++ b/demos/declarative/flickr/content/Slider.qml @@ -10,7 +10,7 @@ Item { property real minimum: 1 property int xMax: Slider.width - Handle.width - 4 - Rect { + Rectangle { id: Container; anchors.fill: parent border.color: "white"; border.width: 0; radius: 8 gradient: Gradient { @@ -19,7 +19,7 @@ Item { } } - Rect { + Rectangle { id: Handle; smooth: true x: Slider.width / 2 - Handle.width / 2; y: 2; width: 30; height: Slider.height-4; radius: 6 gradient: Gradient { diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml index af2fda4..e4d7fe2 100644 --- a/demos/declarative/flickr/flickr.qml +++ b/demos/declarative/flickr/flickr.qml @@ -64,7 +64,7 @@ Item { } } - Rect { + Rectangle { id: WhiteRect; anchors.fill: parent; color: "white"; radius: 5 Loading { x: 26; y: 26; visible: Thumb.status!=1 } diff --git a/demos/declarative/flickr/flickr2.qml b/demos/declarative/flickr/flickr2.qml index 569f286..5fb580c 100644 --- a/demos/declarative/flickr/flickr2.qml +++ b/demos/declarative/flickr/flickr2.qml @@ -63,7 +63,7 @@ Item { } } - Rect { + Rectangle { id: WhiteRect; anchors.fill: parent; color: "white"; radius: 5 Loading { x: 26; y: 26; visible: Thumb.status!=1 } diff --git a/demos/declarative/samegame/SameGame.qml b/demos/declarative/samegame/SameGame.qml index 42c313c..00853ad 100644 --- a/demos/declarative/samegame/SameGame.qml +++ b/demos/declarative/samegame/SameGame.qml @@ -2,11 +2,11 @@ import Qt 4.6 import "content" -Rect { +Rectangle { id: page; width: 460; height: 700; color: activePalette.window Script { source: "content/samegame.js" } Palette { id: activePalette; colorGroup: "Active" } - Rect { + Rectangle { id: gameCanvas property int score: 0 z:20; y:20; color: "white"; border.width: 1 diff --git a/demos/declarative/samegame/content/Button.qml b/demos/declarative/samegame/content/Button.qml index e3d0d30..70b175c 100644 --- a/demos/declarative/samegame/content/Button.qml +++ b/demos/declarative/samegame/content/Button.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: page; color: activePalette.button; width: txtItem.width+20; height: txtItem.height+4 border.width: 1; border.color: activePalette.mid; radius: 10; signal clicked diff --git a/demos/declarative/samegame/content/Dialog.qml b/demos/declarative/samegame/content/Dialog.qml index 7326d73..a3c5f33 100644 --- a/demos/declarative/samegame/content/Dialog.qml +++ b/demos/declarative/samegame/content/Dialog.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { id: page color: "white"; border.width: 1; width: 200; height: 60; property string text: "Hello World!" diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml index 8f1c00e..8d5bc6d 100644 --- a/demos/declarative/webbrowser/webbrowser.qml +++ b/demos/declarative/webbrowser/webbrowser.qml @@ -32,7 +32,7 @@ Item { id: WebPanel anchors.fill: parent clip: true - Rect { + Rectangle { color: "#555555" anchors.fill: parent } @@ -59,7 +59,7 @@ Item { height: 60 z: 1 - Rect { + Rectangle { id: HeaderSpaceTint color: "black" opacity: 0 @@ -212,7 +212,7 @@ Item { property real zoomedOut : 1 } - Rect { + Rectangle { id: WebViewTint color: "black" opacity: 0 @@ -229,7 +229,7 @@ Item { width: parent.width height: 43 anchors.bottom: parent.bottom - Rect { + Rectangle { y: -1 width: parent.width height: 1 diff --git a/doc/src/declarative/anchor-layout.qdoc b/doc/src/declarative/anchor-layout.qdoc index 9ff902ee..69e2eda 100644 --- a/doc/src/declarative/anchor-layout.qdoc +++ b/doc/src/declarative/anchor-layout.qdoc @@ -10,8 +10,8 @@ In additional to the more traditional Fx layouts GridLayout, HorizontalLayout, a The Fx anchoring system allows you to define relationships between the anchor lines of different items. For example, you can write: \code -Rect { id: rect1; ... } -Rect { id: rect2; anchors.left: rect1.right; ... } +Rectangle { id: rect1; ... } +Rectangle { id: rect2; anchors.left: rect1.right; ... } \endcode In this case, the left edge of \e rect2 is bound to the right edge of rect1, producing the following: @@ -25,8 +25,8 @@ The anchoring system also allows you to specify margins and offsets. Margins spe The following example specifies a left margin: \code -Rect { id: rect1; ... } -Rect { id: rect2; anchors.left: rect1.right; anchors.leftMargin: 5; ... } +Rectangle { id: rect1; ... } +Rectangle { id: rect2; anchors.left: rect1.right; anchors.leftMargin: 5; ... } \endcode In this case, a margin of 5 pixels is reserved to the left of \e rect2, producing the following: @@ -36,8 +36,8 @@ In this case, a margin of 5 pixels is reserved to the left of \e rect2, producin You can specify multiple anchors. For example: \code -Rect { id: rect1; ... } -Rect { id: rect2; anchors.left: rect1.right; anchors.top: rect1.bottom; ... } +Rectangle { id: rect1; ... } +Rectangle { id: rect2; anchors.left: rect1.right; anchors.top: rect1.bottom; ... } \endcode \image edge3.png @@ -45,9 +45,9 @@ Rect { id: rect2; anchors.left: rect1.right; anchors.top: rect1.bottom; ... } By specifying multiple horizontal or vertical anchors you can control the size of an item. For example: \code -Rect { id: rect1; x: 0; ... } -Rect { id: rect2; anchors.left: rect1.right; anchors.right: rect3.left; ... } -Rect { id: rect3; x: 150; ... } +Rectangle { id: rect1; x: 0; ... } +Rectangle { id: rect2; anchors.left: rect1.right; anchors.right: rect3.left; ... } +Rectangle { id: rect3; x: 150; ... } \endcode \image edge4.png @@ -58,10 +58,10 @@ For performance reasons, you can only anchor an item to its siblings and direct \code Item { id: group1 } - Rect { id: rect1; ... } + Rectangle { id: rect1; ... } } Item id: group2"> - Rect { id: rect2; anchors.left: rect1.right; ... } // invalid anchor! + Rectangle { id: rect2; anchors.left: rect1.right; ... } // invalid anchor! } \endcode diff --git a/doc/src/declarative/animation.qdoc b/doc/src/declarative/animation.qdoc index 57881a8..eea0fc3 100644 --- a/doc/src/declarative/animation.qdoc +++ b/doc/src/declarative/animation.qdoc @@ -29,7 +29,7 @@ The simplest form of animation is using \l NumberAnimation The following example creates a bouncing effect: \code -Rect { +Rectangle { id: rect width: 120; height: 200; color: "white" Image { @@ -81,7 +81,7 @@ The following example shows a simple use of states. In the default state \c myre \code Item { - Rect { + Rectangle { id: myrect width: 100 height: 100 diff --git a/doc/src/declarative/basictypes.qdoc b/doc/src/declarative/basictypes.qdoc index 684fd0d..092501f 100644 --- a/doc/src/declarative/basictypes.qdoc +++ b/doc/src/declarative/basictypes.qdoc @@ -121,9 +121,9 @@ Setting a color looks like this: \code - Rect { color: "steelblue" } - Rect { color: "#FF0000" } - Rect { color: "#800000FF" } + Rectangle { color: "steelblue" } + Rectangle { color: "#FF0000" } + Rectangle { color: "#800000FF" } \endcode \target basicqmlpoint @@ -275,7 +275,7 @@ Item { children [ Item { id: child1 }, - Rect { id: child2 }, + Rectangle { id: child2 }, Text { id: child3 } ] } diff --git a/doc/src/declarative/binding.qdoc b/doc/src/declarative/binding.qdoc index e74e4b1..36a7e77 100644 --- a/doc/src/declarative/binding.qdoc +++ b/doc/src/declarative/binding.qdoc @@ -7,8 +7,8 @@ Data binding provides a declarative way of specifying the data associated with o Bindings are created in Qml when an expression is assigned to a property. For example, the following produces two Rects of equal size (\c rect2 is bound to the size of \c rect1): \code -Rect { id: rect1; width: 100; height: 100 } -Rect { id: rect2; width: rect1.width; height: rect1.height } +Rectangle { id: rect1; width: 100; height: 100 } +Rectangle { id: rect2; width: rect1.width; height: rect1.height } \endcode There is also a special \l Bind element, which is typically used to bind from the UI to the underlying UI model (see \l {Passing Data Between C++ and Qml} for an example of this). The bindings above could be expressed using the \l Bind element as: diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index c71ac1b..8eeacdf 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -71,7 +71,7 @@ The following table lists the Qml elements provided by the Qt Declarative module \o \list \o \l Item -\o \l Rect +\o \l Rectangle \o \l Image \o \l BorderImage \o \l Text diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc index 27c473e..833a5db 100644 --- a/doc/src/declarative/extending.qdoc +++ b/doc/src/declarative/extending.qdoc @@ -611,11 +611,11 @@ The following example shows how to declare a new "innerColor" property that controls the color of the inner rectangle. \code - Rect { + Rectangle { property color innerColor: "black" color: "red"; width: 100; height: 100 - Rect { + Rectangle { anchors.centerIn: parent width: parent.width - 10 height: parent.height - 10 @@ -655,11 +655,11 @@ alias reference syntax may become more flexibly in future releases. Here is the property definition example rewritten to use property aliases. \code -Rect { +Rectangle { property alias innerColor: InnerRect.color color: "red"; width: 100; height: 100 - Rect { + Rectangle { id: InnerRect anchors.centerIn: parent width: parent.width - 10 @@ -690,11 +690,11 @@ the external rectangle's color as "red" and redefine the "color" property to refer to the inner rectangle, like this: \code -Rect { +Rectangle { property alias color: InnerRect.color color: "red"; width: 100; height: 100 - Rect { + Rectangle { id: InnerRect anchors.centerIn: parent width: parent.width - 10 @@ -802,7 +802,7 @@ multiple times by an application. \row \o application.qml \code -Rect { +Rectangle { width: 100; height: 400; Box { x: 0; y: 0 } Box { x: 0; y: 150 } @@ -811,7 +811,7 @@ Rect { \endcode \o Box.qml \code -Rect { +Rectangle { width: 100; height: 100; color: "blue" } @@ -833,7 +833,7 @@ Rect. As the Rect type has a "color" property, this property is accessible to users of the Box component. For example, the application.qml can be modified to show three different colored boxes like this: \code -Rect { +Rectangle { width: 100; height: 400; Box { x: 0; y: 0; color: "red"; } Box { x: 0; y: 150; color: "yellow"; } @@ -848,7 +848,7 @@ available externally. Here we add a "text" property: \row \o application.qml \code -Rect { +Rectangle { width: 100; height: 400; Box { x: 0; y: 0; color: "red"; text: "stop" } Box { x: 0; y: 150; color: "yellow"; text: "slow" } @@ -857,7 +857,7 @@ Rect { \endcode \o Box.qml \code -Rect { +Rectangle { property alias text: MyText.text width: 100; height: 100; color: "blue" diff --git a/doc/src/declarative/focus.qdoc b/doc/src/declarative/focus.qdoc index 60311da..5c53483 100644 --- a/doc/src/declarative/focus.qdoc +++ b/doc/src/declarative/focus.qdoc @@ -23,7 +23,7 @@ If the \c {Rect} element in the following example has active focus and the \e A Item { KeyActions { keyA: "print('Key A was pressed')" - Rect {} + Rectangle {} } } \endcode @@ -56,7 +56,7 @@ the \c {KeyActions} element has \e {active focus} and pressing the \table \row \o \code - Rect { + Rectangle { color: "lightsteelblue"; width: 240; height: 25 Text { id: MyText } KeyActions { @@ -81,16 +81,16 @@ reponds accordingly. \table \row \o \code -Rect { +Rectangle { color: "red"; width: 240; height: 55 MyWidget {} MyWidget { y: 30; focus: true } } \endcode \o \code -Rect { +Rectangle { color: "red"; width: 240; height: 55 - Rect { + Rectangle { color: "lightsteelblue"; width: 240; height: 25 Text { id: MyText } KeyActions { @@ -100,7 +100,7 @@ Rect { keyC: "MyText.text = 'Key C was pressed'" } } - Rect { + Rectangle { y: 30; focus: true color: "lightsteelblue"; width: 240; height: 25 Text { id: MyText } @@ -147,7 +147,7 @@ result shown. \o \code FocusScope { width: 240; height: 25 - Rect { + Rectangle { color: "lightsteelblue"; width: 240; height: 25 Text { id: MyText } KeyActions { @@ -178,7 +178,7 @@ then on clicking the either one gives it focus. \table \row \o \code -Rect { +Rectangle { color: "red"; width: 240; height: 55 MyClickableWidget {} MyClickableWidget { y: 30; focus: true } @@ -217,7 +217,7 @@ print the name of the current list item. \table \row \o \code -Rect { +Rectangle { color: "lightsteelblue"; width: 240; height: 320 ListView { diff --git a/doc/src/declarative/qmlforcpp.qdoc b/doc/src/declarative/qmlforcpp.qdoc index 53af252..5838df7 100644 --- a/doc/src/declarative/qmlforcpp.qdoc +++ b/doc/src/declarative/qmlforcpp.qdoc @@ -29,7 +29,7 @@ \code QmlEngine engine; - QmlComponent redRectangle(&engine, "Rect { color: \"red\"; width: 100; height: 100 }"); + QmlComponent redRectangle(&engine, "Rectangle { color: \"red\"; width: 100; height: 100 }"); for (int ii = 0; ii < 100; ++ii) { QObject *rectangle = redRectangle.create(); // ... do something with the rectangle ... @@ -127,7 +127,7 @@ added to the parent's \c children property. \code - Rect { + Rectangle { Image {} Text {} } @@ -208,14 +208,14 @@ rectangles height would be updated automatically. \code - Rect { + Rectangle { color: "red" width: 100 - Rect { + Rectangle { color: "blue" width: 50 height: parent.height - Rect { + Rectangle { color: "green" width: 25 height: parent.height @@ -283,14 +283,14 @@ example rewritten to do just that. \code - Rect { + Rectangle { color: "red" width: 100 - Rect { + Rectangle { color: "blue" width: 50 height: parent.height - Rect { + Rectangle { color: "green" width: 25 height: parent.parent.height @@ -313,15 +313,15 @@ a component. By convention, id's should start with an uppercase letter. \code - Rect { + Rectangle { id: Root color: "red" width: GreenRect.width + 75 height: Root.height - Rect { + Rectangle { color: "blue" width: GreenRect.width + 25 - Rect { + Rectangle { id: GreenRect color: "green" width: 25 @@ -554,7 +554,7 @@ Consider the following example. \code - Rect { + Rectangle { x: NumberAnimation { running: true; repeat; true; from: 0; to: 100; } } \endcode diff --git a/doc/src/declarative/qmlintro.qdoc b/doc/src/declarative/qmlintro.qdoc index 783d077..77aa3e2 100644 --- a/doc/src/declarative/qmlintro.qdoc +++ b/doc/src/declarative/qmlintro.qdoc @@ -23,7 +23,7 @@ technologies like HTML and CSS, but not required. Qml looks like this: \code -Rect { +Rectangle { width: 200 height: 200 color: "white" @@ -36,7 +36,7 @@ Rect { Objects are specified by their type, followed by a pair of braces. Object types always begin with a capital letter. In the above example, there are -two objects, a \l Rect, and an \l Image. Between the braces, we can specify +two objects, a \l Rectangle, and an \l Image. Between the braces, we can specify information about the object, such as its properties. Properties are specified as \c {property: value} (much like CSS). In the above @@ -47,7 +47,7 @@ separated by a colon. Properties can be specified one-per-line: \code -Rect { +Rectangle { width: 100 height: 100 } @@ -56,7 +56,7 @@ Rect { or you can put multiple properties on a single line: \code -Rect { width: 100; height: 100 } +Rectangle { width: 100; height: 100 } \endcode When multiple property/value pairs are specified on a single line, they @@ -189,7 +189,7 @@ list, you can omit the square brackets: \code Image { - children: Rect {} + children: Rectangle {} } \endcode diff --git a/doc/src/declarative/tutorial1.qdoc b/doc/src/declarative/tutorial1.qdoc index d38dc54..d4f1095 100644 --- a/doc/src/declarative/tutorial1.qdoc +++ b/doc/src/declarative/tutorial1.qdoc @@ -1,4 +1,4 @@ -/*! +/*! \page tutorial1.html \title Tutorial 1 - Hello World! \target tutorial1 @@ -10,7 +10,7 @@ This first program is a simple "Hello world" example. The picture below is a scr Here is the QML code for the application: \code -Rect { +Rectangle { id: Page width: 480 height: 200 @@ -28,10 +28,10 @@ Rect { \section1 Walkthrough -\section2 Rect element +\section2 Rectangle element \code -Rect { +Rectangle { id: Page width: 480 height: 200 @@ -39,9 +39,9 @@ Rect { } \endcode -First, we declare a root element of type \l Rect. It is one of the basic building blocks you can use to create an application in QML. -We give it an id to be able to refer to it later. In this case, we call it \e Page. We also set the \c width, \c height and \c color properties. -The \l Rect element contains many other properties (such as \c x and \c y), but these are left at their default values. +First, we declare a root element of type \l Rectangle. It is one of the basic building blocks you can use to create an application in QML. +We give it an id to be able to refer to it later. In this case, we call it \e Page. We also set the \c width, \c height and \c color properties. +The \l Rectangle element contains many other properties (such as \c x and \c y), but these are left at their default values. \section2 Text element diff --git a/doc/src/declarative/tutorial2.qdoc b/doc/src/declarative/tutorial2.qdoc index 4be0702..410d119 100644 --- a/doc/src/declarative/tutorial2.qdoc +++ b/doc/src/declarative/tutorial2.qdoc @@ -19,7 +19,7 @@ Item { width: 40 height: 25 - Rect { + Rectangle { anchors.fill: parent color: CellContainer.color } @@ -33,7 +33,7 @@ Item { Then, we use our \c Cell component to create the color picker in the QML code for the application: \code -Rect { +Rectangle { id: Page width: 480 height: 200 @@ -83,7 +83,7 @@ property var color We declare a \c color property. This property is accessible from \e outside our component, this allows us to instantiate the cells with different colors. \code -Rect { +Rectangle { anchors.fill: parent color: CellContainer.color } diff --git a/doc/src/declarative/tutorial3.qdoc b/doc/src/declarative/tutorial3.qdoc index 0f9dac2..3517f97 100644 --- a/doc/src/declarative/tutorial3.qdoc +++ b/doc/src/declarative/tutorial3.qdoc @@ -12,7 +12,7 @@ We want our text to jump at the bottom of the screen and become red when clicked Here is the QML code: \code -Rect { +Rectangle { id: Page width: 480 height: 200 diff --git a/doc/src/snippets/declarative/GroupBox.qml b/doc/src/snippets/declarative/GroupBox.qml index efbe4e5..13e7eb6 100644 --- a/doc/src/snippets/declarative/GroupBox.qml +++ b/doc/src/snippets/declarative/GroupBox.qml @@ -3,7 +3,7 @@ import Qt 4.6 ContentWrapper { id: Container; width: parent.width; height: contents.height children: [ - Rect { + Rectangle { width: parent.width; height: contents.height color: "white"; pen.width: 2; pen.color: "#adaeb0"; radius: 10 VerticalLayout { diff --git a/doc/src/snippets/declarative/content.qml b/doc/src/snippets/declarative/content.qml index 1e01b29..fb03ced 100644 --- a/doc/src/snippets/declarative/content.qml +++ b/doc/src/snippets/declarative/content.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { width: 200; height: 100; color: "lightgray" GroupBox { Text { text: "First Item" } diff --git a/doc/src/snippets/declarative/drag.qml b/doc/src/snippets/declarative/drag.qml index 8b1765b..8735d0c 100644 --- a/doc/src/snippets/declarative/drag.qml +++ b/doc/src/snippets/declarative/drag.qml @@ -1,7 +1,7 @@ import Qt 4.6 //! [0] -Rect { +Rectangle { id: blurtest; width: 600; height: 200; color: "white" Image { id: pic; source: "qtlogo-64.png"; anchors.verticalCenter: parent.verticalCenter diff --git a/doc/src/snippets/declarative/gradient.qml b/doc/src/snippets/declarative/gradient.qml index 19923ac..281360e 100644 --- a/doc/src/snippets/declarative/gradient.qml +++ b/doc/src/snippets/declarative/gradient.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { width: 100; height: 100 gradient: Gradient { GradientStop { position: 0.0; color: "red" } diff --git a/doc/src/snippets/declarative/gridview/gridview.qml b/doc/src/snippets/declarative/gridview/gridview.qml index 208118d..d0f0623 100644 --- a/doc/src/snippets/declarative/gridview/gridview.qml +++ b/doc/src/snippets/declarative/gridview/gridview.qml @@ -1,7 +1,7 @@ import Qt 4.6 //! [3] -Rect { +Rectangle { width: 240; height: 180; color: "white" // ContactModel model is defined in dummydata/ContactModel.qml // The viewer automatically loads files in dummydata/* to assist @@ -27,7 +27,7 @@ Rect { //! [1] Component { id: Highlight - Rect { + Rectangle { color: "lightsteelblue" radius: 5 } diff --git a/doc/src/snippets/declarative/listview/highlight.qml b/doc/src/snippets/declarative/listview/highlight.qml index 3d13170..29f41bf 100644 --- a/doc/src/snippets/declarative/listview/highlight.qml +++ b/doc/src/snippets/declarative/listview/highlight.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { width: 180; height: 200; color: "white" // ContactModel model is defined in dummydata/ContactModel.qml @@ -29,7 +29,7 @@ Rect { //! [1] Component { id: Highlight - Rect { + Rectangle { width: 180; height: 40 color: "lightsteelblue"; radius: 5 y: Follow { diff --git a/doc/src/snippets/declarative/listview/listview.qml b/doc/src/snippets/declarative/listview/listview.qml index 50677ba..c907077 100644 --- a/doc/src/snippets/declarative/listview/listview.qml +++ b/doc/src/snippets/declarative/listview/listview.qml @@ -1,7 +1,7 @@ import Qt 4.6 //! [3] -Rect { +Rectangle { width: 180; height: 200; color: "white" // ContactModel model is defined in dummydata/ContactModel.qml @@ -29,7 +29,7 @@ Rect { //! [1] Component { id: Highlight - Rect { + Rectangle { color: "lightsteelblue" radius: 5 } diff --git a/doc/src/snippets/declarative/mouseregion.qml b/doc/src/snippets/declarative/mouseregion.qml index d3e22cd..6d8f179 100644 --- a/doc/src/snippets/declarative/mouseregion.qml +++ b/doc/src/snippets/declarative/mouseregion.qml @@ -1,14 +1,14 @@ import Qt 4.6 -Rect { width: 200; height: 100 +Rectangle { width: 200; height: 100 HorizontalLayout { //! [0] -Rect { width: 100; height: 100; color: "green" +Rectangle { width: 100; height: 100; color: "green" MouseRegion { anchors.fill: parent; onClicked: { parent.color = 'red' } } } //! [0] //! [1] -Rect { +Rectangle { width: 100; height: 100; color: "green" MouseRegion { anchors.fill: parent diff --git a/doc/src/snippets/declarative/pathview/pathattributes.qml b/doc/src/snippets/declarative/pathview/pathattributes.qml index 39c7122..3c2b204 100644 --- a/doc/src/snippets/declarative/pathview/pathattributes.qml +++ b/doc/src/snippets/declarative/pathview/pathattributes.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { width: 240; height: 200; color: 'white' //! [0] //! [1] diff --git a/doc/src/snippets/declarative/pathview/pathview.qml b/doc/src/snippets/declarative/pathview/pathview.qml index 70f498c..f5db242 100644 --- a/doc/src/snippets/declarative/pathview/pathview.qml +++ b/doc/src/snippets/declarative/pathview/pathview.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { width: 240; height: 200; color: 'white' //! [0] //! [1] diff --git a/doc/src/snippets/declarative/repeater.qml b/doc/src/snippets/declarative/repeater.qml index a58972f..309fead 100644 --- a/doc/src/snippets/declarative/repeater.qml +++ b/doc/src/snippets/declarative/repeater.qml @@ -1,14 +1,14 @@ import Qt 4.6 //! [0] -Rect { width: 220; height: 20; color: "white" +Rectangle { width: 220; height: 20; color: "white" Component { id: Dot - Rect { width: 20; height: 20; radius: 10; color: "green" } + Rectangle { width: 20; height: 20; radius: 10; color: "green" } } HorizontalLayout { - Rect { width: 10; height: 20; color: "red" } + Rectangle { width: 10; height: 20; color: "red" } Repeater { component: Dot; dataSource: 10 } - Rect { width: 10; height: 20; color: "blue" } + Rectangle { width: 10; height: 20; color: "blue" } } } //! [0] diff --git a/doc/src/snippets/declarative/rotation.qml b/doc/src/snippets/declarative/rotation.qml index ab7d4ca..aaaebee 100644 --- a/doc/src/snippets/declarative/rotation.qml +++ b/doc/src/snippets/declarative/rotation.qml @@ -1,6 +1,6 @@ import Qt 4.6 -Rect { +Rectangle { width: 360; height: 80 color: "white" //! [0] diff --git a/doc/src/tutorials/declarative.qdoc b/doc/src/tutorials/declarative.qdoc index e848dfa..dde0615 100644 --- a/doc/src/tutorials/declarative.qdoc +++ b/doc/src/tutorials/declarative.qdoc @@ -50,7 +50,7 @@ \brief An introduction to using Qt Declarative UI to put together a simple animated application. - \omit + \omit At the time of writing the tutorial Declarative UI was still under development. It is extremely likely that an update will be required prior to 4.6 release. @@ -124,8 +124,8 @@ This is one of the simplest of QML components. It describes a rectangle with some simple properties. In QML all components start with a capital letter, and their properties with lower case letters. - - Apart from the properties all QML components share, the \l{Rect}{Rect} component has the properties + + Apart from the properties all QML components share, the \l{Rectangle}{Rectangle} component has the properties \list \o color - The background color of the rectangle @@ -152,11 +152,11 @@ The next step of the tutorial adds an image over the rectangle. We will do this by adding an \l{Image}{Image} component as a child of the - \l{Rect}{Rect} component. All QML components have a list of children which + \l{Rectangle}{Rectangle} component. All QML components have a list of children which are drawn in order after the parent component has been drawn. By having the \l{Image}{Image} - component as a child of the \l{Rect}{Rect} component we ensure it is drawn - over the \l{Rect}{Rect} component. Children also are affected by the opacity + component as a child of the \l{Rectangle}{Rectangle} component we ensure it is drawn + over the \l{Rectangle}{Rectangle} component. Children also are affected by the opacity of the parent component and calculate their position in within the bounds of the parent component. @@ -166,7 +166,7 @@ The trashIcon image is added as a child of the Rectangle. In this case the children property isn't explicitly used because the default property - of the \l{Rect}{Rect} component is its children. Some elements often don't have children + of the \l{Rectangle}{Rectangle} component is its children. Some elements often don't have children and use some other default component. When this is the case its possible to explicitly list the sub component as a child as follows: @@ -184,7 +184,7 @@ position to align to the right of its parent and for its vertical center to align with the vertical center of its parent. Setting a property by the identifier of a separate property binds them. This means - that if while running the example the position of the \l{Rect}{Rect} component's + that if while running the example the position of the \l{Rectangle}{Rectangle} component's vertical center changed, so to would the vertical center of the \l{Image}{Image} component. @@ -239,12 +239,12 @@ might look like. \code - Rect { + Rectangle { id: removeButton width: 30 height: 30 - color: "red" - radius: 5 + color: "red" + radius: 5 Image { id: trashIcon width: 22 @@ -360,7 +360,7 @@ \tableofcontents The second part of this tutorial covers how to reuse QML components and - have them interact with each other. The RemoveButton developed in the + have them interact with each other. The RemoveButton developed in the previous chapter is intended to be part of a more complex control for editing a field of our contact. This ContactField in turn is intended to be used in a contact editing control. @@ -395,7 +395,7 @@ can be reused from within the same QML file using Component and ComponentInstance elements. The next code snippet produces three red rounded rectangles within a large blue rectangle. - + \image declarative-reuse-bluerect.png \snippet declarative/tutorials/contacts/2_Reuse/1b/BlueRect.qml all @@ -467,7 +467,7 @@ Apart from accessing the fieldText.state, the above code also uses the when attribute of its own editingText state. This is an alternative to using - a signal to change state. When the value of the expression for the + a signal to change state. When the value of the expression for the when attribute changes, Qt will detect if the contactField needs to enter that state. In the FieldText element a similar approach is used to fade out the label of the FieldText when the user enters some text of their own. @@ -500,7 +500,7 @@ to receive focus \endlist - The read-only property activeFocus can be used to determine whether a + The read-only property activeFocus can be used to determine whether a component will receive key input. Any un-handled keys will be passed to the components parent, which in turn will pass keys it doesn't handle up to its own ancestors. @@ -573,7 +573,7 @@ When the query is a select statement, the component also acts as a model allowing it to provide data to a ListView component. The query above retrieves the fields recid, label, email and phone from a contacts table, - and orders the results by the label of the contact first, and then by + and orders the results by the label of the contact first, and then by the recid for any contacts with equivalent labels. The ListView component is suitable for displaying models and is declared @@ -638,7 +638,7 @@ Something worth noting at this point is that every delegate created has this connection. It is important to check whether the delegate is the one in the open state, and taking some effort to ensure only one is, before acting on the signal from the button. - + \section1 Performance Considerations We have now made a contact application that can view a list of contacts, open one, 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 diff --git a/src/declarative/extra/qfxanimatedimageitem.cpp b/src/declarative/extra/qfxanimatedimageitem.cpp index daacdac..d366111 100644 --- a/src/declarative/extra/qfxanimatedimageitem.cpp +++ b/src/declarative/extra/qfxanimatedimageitem.cpp @@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE Item { width: anim.width; height: anim.height+8 AnimatedImage { id: anim; source: "pics/games-anim.gif" } - Rect { color: "red"; width: 4; height: 8; y: anim.height + Rectangle { color: "red"; width: 4; height: 8; y: anim.height x: (anim.width-width)*anim.currentFrame/(anim.frameCount-1) } } diff --git a/src/declarative/extra/qfxparticles.cpp b/src/declarative/extra/qfxparticles.cpp index 2380655..ec15099 100644 --- a/src/declarative/extra/qfxparticles.cpp +++ b/src/declarative/extra/qfxparticles.cpp @@ -238,7 +238,7 @@ void QFxParticleMotionGravity::advance(QFxParticle &p, int interval) The code below produces an effect similar to falling snow. \qml -Rect { +Rectangle { width: 240 height: 320 color: "black" @@ -546,7 +546,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Particles,QFxParticles) the lower one has particles expelled up like a fountain. \qml -Rect { +Rectangle { width: 240 height: 320 color: "black" diff --git a/src/declarative/extra/qmlbehaviour.cpp b/src/declarative/extra/qmlbehaviour.cpp index 052225a..767f1ed 100644 --- a/src/declarative/extra/qmlbehaviour.cpp +++ b/src/declarative/extra/qmlbehaviour.cpp @@ -107,7 +107,7 @@ public: In example below, the rect will use a bounce easing curve over 200 millisecond for any changes to its y property: \code - Rect { + Rectangle { width: 20; height: 20 color: "#00ff00" y: 200 //initial value diff --git a/src/declarative/fx/qfxcomponentinstance.cpp b/src/declarative/fx/qfxcomponentinstance.cpp index f38d170..def7a9f 100644 --- a/src/declarative/fx/qfxcomponentinstance.cpp +++ b/src/declarative/fx/qfxcomponentinstance.cpp @@ -63,7 +63,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,ComponentInstance,QFxComponentIn Item { Component { id: RedSquare - Rect { color: "red"; width: 10; height: 10 } + Rectangle { color: "red"; width: 10; height: 10 } } ComponentInstance { component: RedSquare } diff --git a/src/declarative/fx/qfxflickable.cpp b/src/declarative/fx/qfxflickable.cpp index 1cb8336..428815a 100644 --- a/src/declarative/fx/qfxflickable.cpp +++ b/src/declarative/fx/qfxflickable.cpp @@ -445,7 +445,7 @@ bool QFxFlickable::isAtYBeginning() const These properties are typically used to draw a scrollbar, for example: \code - Rect { + Rectangle { opacity: 0.5; anchors.right: MyListView.right-2; width: 6 y: MyListView.pageYPosition * MyListView.height height: MyListView.pageHeight * MyListView.height diff --git a/src/declarative/fx/qfxgridview.cpp b/src/declarative/fx/qfxgridview.cpp index 28f2219..b445e49 100644 --- a/src/declarative/fx/qfxgridview.cpp +++ b/src/declarative/fx/qfxgridview.cpp @@ -878,7 +878,7 @@ void QFxGridView::setHighlight(QmlComponent *highlight) \code Component { id: Highlight - Rect { + Rectangle { id: Wrapper; color: "lightsteelblue"; radius: 4; width: 320; height: 60 > y: Follow { source: Wrapper.GridView.view.current.y; spring: 3; damping: 0.2 } x: Follow { source: Wrapper.GridView.view.current.x; spring: 3; damping: 0.2 } diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp index 4ec0a85..83b4eb5 100644 --- a/src/declarative/fx/qfxitem.cpp +++ b/src/declarative/fx/qfxitem.cpp @@ -90,7 +90,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Rotation,QGraphicsRotation) The following example scales the X axis of the Rect, relative to its interior point 25, 25: \qml - Rect { + Rectangle { width: 100; height: 100 color: "blue" transform: Scale { origin.x: 25; origin.y: 25; xScale: 3} @@ -123,7 +123,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Rotation,QGraphicsRotation) The following example rotates a Rect around its interior point 25, 25: \qml - Rect { + Rectangle { width: 100; height: 100 color: "blue" transform: Rotation { origin.x: 25; origin.y: 25; angle: 45} @@ -1026,7 +1026,7 @@ QFxItem *QFxItem::parentItem() const Item { children: [ Text {}, - Rect {} + Rectangle {} ] resources: [ Component { @@ -1230,7 +1230,7 @@ void QFxItemPrivate::transform_clear() \qml Item { Text {} - Rect {} + Rectangle {} Script {} } \endqml @@ -1240,7 +1240,7 @@ void QFxItemPrivate::transform_clear() Item { children: [ Text {}, - Rect {} + Rectangle {} ] resources: [ Script {} @@ -1339,11 +1339,11 @@ void QFxItem::setClip(bool c) \o Same \c z - later children above earlier children: \qml Item { - Rect { + Rectangle { color: "red" width: 100; height: 100 } - Rect { + Rectangle { color: "blue" x: 50; y: 50; width: 100; height: 100 } @@ -1354,12 +1354,12 @@ void QFxItem::setClip(bool c) \o Higher \c z on top: \qml Item { - Rect { + Rectangle { z: 1 color: "red" width: 100; height: 100 } - Rect { + Rectangle { color: "blue" x: 50; y: 50; width: 100; height: 100 } @@ -1370,10 +1370,10 @@ void QFxItem::setClip(bool c) \o Same \c z - children above parents: \qml Item { - Rect { + Rectangle { color: "red" width: 100; height: 100 - Rect { + Rectangle { color: "blue" x: 50; y: 50; width: 100; height: 100 } @@ -1385,10 +1385,10 @@ void QFxItem::setClip(bool c) \o Lower \c z below: \qml Item { - Rect { + Rectangle { color: "red" width: 100; height: 100 - Rect { + Rectangle { z: -1 color: "blue" x: 50; y: 50; width: 100; height: 100 @@ -1717,14 +1717,14 @@ void QFxItem::setBaselineOffset(qreal offset) \o \image declarative-rotation.png \o \qml - Rect { + Rectangle { color: "blue" width: 100; height: 100 - Rect { + Rectangle { color: "green" width: 25; height: 25 } - Rect { + Rectangle { color: "red" x: 25; y: 25; width: 50; height: 50 rotation: 30 @@ -1753,14 +1753,14 @@ void QFxItem::setBaselineOffset(qreal offset) \o \image declarative-scale.png \o \qml - Rect { + Rectangle { color: "blue" width: 100; height: 100 - Rect { + Rectangle { color: "green" width: 25; height: 25 } - Rect { + Rectangle { color: "red" x: 25; y: 25; width: 50; height: 50 scale: 1.4 @@ -1787,10 +1787,10 @@ void QFxItem::setBaselineOffset(qreal offset) \o \qml Item { - Rect { + Rectangle { color: "red" width: 100; height: 100 - Rect { + Rectangle { color: "blue" x: 50; y: 50; width: 100; height: 100 } @@ -1802,11 +1802,11 @@ void QFxItem::setBaselineOffset(qreal offset) \o \qml Item { - Rect { + Rectangle { opacity: 0.5 color: "red" width: 100; height: 100 - Rect { + Rectangle { color: "blue" x: 50; y: 50; width: 100; height: 100 } diff --git a/src/declarative/fx/qfxmouseregion.cpp b/src/declarative/fx/qfxmouseregion.cpp index 858764a..011ee43 100644 --- a/src/declarative/fx/qfxmouseregion.cpp +++ b/src/declarative/fx/qfxmouseregion.cpp @@ -126,8 +126,8 @@ void QFxDrag::setYmax(qreal m) A MouseRegion is typically used in conjunction with a visible item, where the MouseRegion effectively 'proxies' mouse handling for that - item. For example, we can put a MouseRegion in a Rect that changes - the Rect color to red when clicked: + item. For example, we can put a MouseRegion in a Rectangle that changes + the Rectangle color to red when clicked: \snippet doc/src/snippets/declarative/mouseregion.qml 0 Many MouseRegion signals pass a \l {MouseEvent}{mouse} parameter that contains diff --git a/src/declarative/fx/qfxpositioners.cpp b/src/declarative/fx/qfxpositioners.cpp index 1eb88fe..7f731cf 100644 --- a/src/declarative/fx/qfxpositioners.cpp +++ b/src/declarative/fx/qfxpositioners.cpp @@ -335,9 +335,9 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,VerticalPositioner,QFxVerticalPo \qml VerticalPositioner { spacing: 2 - Rect { color: "red"; width: 50; height: 50 } - Rect { color: "green"; width: 20; height: 50 } - Rect { color: "blue"; width: 50; height: 20 } + Rectangle { color: "red"; width: 50; height: 50 } + Rectangle { color: "green"; width: 20; height: 50 } + Rectangle { color: "blue"; width: 50; height: 20 } } \endqml \endtable @@ -519,9 +519,9 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,HorizontalPositioner,QFxHorizont \qml HorizontalPositioner { spacing: 2 - Rect { color: "red"; width: 50; height: 50 } - Rect { color: "green"; width: 20; height: 50 } - Rect { color: "blue"; width: 50; height: 20 } + Rectangle { color: "red"; width: 50; height: 50 } + Rectangle { color: "green"; width: 20; height: 50 } + Rectangle { color: "blue"; width: 50; height: 20 } } \endqml \image horizontalpositioner_example.png @@ -684,11 +684,11 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,GridPositioner,QFxGridPositioner GridPositioner { columns: 3 spacing: 2 - Rect { color: "red"; width: 50; height: 50 } - Rect { color: "green"; width: 20; height: 50 } - Rect { color: "blue"; width: 50; height: 20 } - Rect { color: "cyan"; width: 50; height: 50 } - Rect { color: "magenta"; width: 10; height: 10 } + Rectangle { color: "red"; width: 50; height: 50 } + Rectangle { color: "green"; width: 20; height: 50 } + Rectangle { color: "blue"; width: 50; height: 20 } + Rectangle { color: "cyan"; width: 50; height: 50 } + Rectangle { color: "magenta"; width: 10; height: 10 } } \endqml \endtable diff --git a/src/declarative/fx/qfxrect.cpp b/src/declarative/fx/qfxrect.cpp index 3a7e350..a9418e2 100644 --- a/src/declarative/fx/qfxrect.cpp +++ b/src/declarative/fx/qfxrect.cpp @@ -52,7 +52,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Gradient,QFxGradient) /*! \internal \class QFxPen - \brief The QFxPen class provides a pen used for drawing rect borders on a QFxView. + \brief The QFxPen class provides a pen used for drawing rectangle borders on a QFxView. By default, the pen is invalid and nothing is drawn. You must either set a color (then the default width is 1) or a width (then the default color is black). @@ -61,7 +61,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Gradient,QFxGradient) Example: \qml - Rect { border.width: 2; border.color: "red" ... } + Rectangle { border.width: 2; border.color: "red" ... } \endqml */ @@ -107,8 +107,8 @@ void QFxGradientStop::updateGradient() A gradient is defined by two or more colors, which will be blended seemlessly. The colors are specified at their position in the range 0.0 - 1.0 via the GradientStop item. For example, the following code paints a - Rect with a gradient starting with red, blending to yellow at 1/3 of the - size of the Rect, and ending with Green: + rectangle with a gradient starting with red, blending to yellow at 1/3 of the + size of the rectangle, and ending with Green: \table \row @@ -145,18 +145,18 @@ void QFxGradient::doUpdate() emit updated(); } -QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Rect,QFxRect) +QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Rectangle,QFxRect) /*! - \qmlclass Rect QFxRect - \brief The Rect item allows you to add rectangles to a scene. + \qmlclass Rectangle QFxRect + \brief The Rectangle item allows you to add rectangles to a scene. \inherits Item - A Rect is painted having a solid fill (color) and an optional border (pen). + A Rectangle is painted having a solid fill (color) and an optional border. You can also create rounded rectangles using the radius property. \qml - Rect { + Rectangle { width: 100 height: 100 color: "red" @@ -172,7 +172,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Rect,QFxRect) /*! \internal \class QFxRect - \brief The QFxRect class provides a rect item that you can add to a QFxView. + \brief The QFxRect class provides a rectangle item that you can add to a QFxView. */ QFxRect::QFxRect(QFxItem *parent) : QFxItem(*(new QFxRectPrivate), parent) @@ -200,14 +200,14 @@ void QFxRect::doUpdate() } /*! - \qmlproperty int Rect::border.width - \qmlproperty color Rect::border.color + \qmlproperty int Rectangle::border.width + \qmlproperty color Rectangle::border.color - The width and color used to draw the border of the rect. + The width and color used to draw the border of the rectangle. A width of 1 creates a thin line. For no line, use a width of 0 or a transparent color. - To keep the border smooth (rather than blurry), odd widths cause the rect to be painted at + To keep the border smooth (rather than blurry), odd widths cause the rectangle to be painted at a half-pixel offset; */ QFxPen *QFxRect::border() @@ -217,26 +217,26 @@ QFxPen *QFxRect::border() } /*! - \qmlproperty Gradient Rect::gradient + \qmlproperty Gradient Rectangle::gradient - The gradient to use to fill the rect. + The gradient to use to fill the rectangle. This property allows for the construction of simple vertical gradients. - Other gradients may by formed by adding rotation to the rect. + Other gradients may by formed by adding rotation to the rectangle. \table \row \o \image declarative-rect_gradient.png \o \qml - Rect { y: 0; width: 80; height: 80; color: "lightsteelblue" } - Rect { y: 100; width: 80; height: 80 + Rectangle { y: 0; width: 80; height: 80; color: "lightsteelblue" } + Rectangle { y: 100; width: 80; height: 80 gradient: Gradient { GradientStop { position: 0.0; color: "lightsteelblue" } GradientStop { position: 1.0; color: "blue" } } } - Rect { rotation: 90; x: 80; y: 200; width: 80; height: 80 + Rectangle { rotation: 90; x: 80; y: 200; width: 80; height: 80 gradient: Gradient { GradientStop { position: 0.0; color: "lightsteelblue" } GradientStop { position: 1.0; color: "blue" } @@ -271,10 +271,10 @@ void QFxRect::setGradient(QFxGradient *gradient) /*! - \qmlproperty real Rect::radius - This property holds the corner radius used to draw a rounded rect. + \qmlproperty real Rectangle::radius + This property holds the corner radius used to draw a rounded rectangle. - If radius is non-zero, the rect will be painted as a rounded rectangle, otherwise it will be + If radius is non-zero, the rectangle will be painted as a rounded rectangle, otherwise it will be painted as a normal rectangle. The same radius is used by all 4 corners; there is currently no way to specify different radii for different corners. */ @@ -296,15 +296,15 @@ void QFxRect::setRadius(qreal radius) } /*! - \qmlproperty color Rect::color - This property holds the color used to fill the rect. + \qmlproperty color Rectangle::color + This property holds the color used to fill the rectangle. \qml - // green rect using hexidecimal notation - Rect { color: "#00FF00" } + // green rectangle using hexidecimal notation + Rectangle { color: "#00FF00" } - // steelblue rect using SVG color name - Rect { color: "steelblue" } + // steelblue rectangle using SVG color name + Rectangle { color: "steelblue" } \endqml The default color is white. @@ -329,14 +329,14 @@ void QFxRect::setColor(const QColor &c) } /*! - \qmlproperty color Rect::tintColor + \qmlproperty color Rectangle::tintColor This property holds The color to tint the rectangle. - This color will be drawn over the rect's color when the rect is painted. The tint color should usually be mostly transparent, or you will not be able to see the underlying color. The below example provides a slight red tint by having the tint color be pure red which is only 1/16th opaque. + This color will be drawn over the rectangle's color when the rectangle is painted. The tint color should usually be mostly transparent, or you will not be able to see the underlying color. The below example provides a slight red tint by having the tint color be pure red which is only 1/16th opaque. \qml - Rect { x: 0; width: 80; height: 80; color: "lightsteelblue" } - Rect { x: 100; width: 80; height: 80; color: "lightsteelblue"; tintColor: "#10FF0000" } + Rectangle { x: 0; width: 80; height: 80; color: "lightsteelblue" } + Rectangle { x: 100; width: 80; height: 80; color: "lightsteelblue"; tintColor: "#10FF0000" } \endqml \image declarative-rect_tint.png @@ -553,7 +553,7 @@ void QFxRect::drawRect(QPainter &p) } /*! - \qmlproperty bool Rect::smooth + \qmlproperty bool Rectangle::smooth Set this property if you want the item to be smoothly scaled or transformed. Smooth filtering gives better visual quality, but is slower. If diff --git a/src/declarative/fx/qfxvisualitemmodel.cpp b/src/declarative/fx/qfxvisualitemmodel.cpp index fdeece9..fd2796c 100644 --- a/src/declarative/fx/qfxvisualitemmodel.cpp +++ b/src/declarative/fx/qfxvisualitemmodel.cpp @@ -139,9 +139,9 @@ public: Item { VisualItemModel { id: ItemModel - Rect { height: 30; width: 80; color: "red" } - Rect { height: 30; width: 80; color: "green" } - Rect { height: 30; width: 80; color: "blue" } + Rectangle { height: 30; width: 80; color: "red" } + Rectangle { height: 30; width: 80; color: "green" } + Rectangle { height: 30; width: 80; color: "blue" } } ListView { diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp index c30efca..0e141da 100644 --- a/src/declarative/qml/qmlcomponent.cpp +++ b/src/declarative/qml/qmlcomponent.cpp @@ -85,7 +85,7 @@ int statusId = qRegisterMetaType<QmlComponent::Status>("QmlComponent::Status"); Item { Component { id: RedSquare - Rect { + Rectangle { color: "red" width: 10 height: 10 diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp index 2000e51..22a8e49 100644 --- a/src/declarative/qml/qmldom.cpp +++ b/src/declarative/qml/qmldom.cpp @@ -76,14 +76,14 @@ QmlDomDocumentPrivate::~QmlDomDocumentPrivate() \brief The QmlDomDocument class represents the root of a QML document A QML document is a self-contained snippet of QML, usually contained in a - single file. Each document has a version number, accessible through - QmlDomDocument::version(), and a root object, accessible through + single file. Each document has a version number, accessible through + QmlDomDocument::version(), and a root object, accessible through QmlDomDocument::rootObject(). The QmlDomDocument class allows the programmer to load a QML document, by calling QmlDomDocument::load(), manipulate it and save it to textual form by calling QmlDomDocument::save(). By using the QML DOM API, editors can - non-destructively modify a QML document even if they only understand a + non-destructively modify a QML document even if they only understand a subset of the total QML functionality. The following example loads a QML file from disk, and prints out its root @@ -179,7 +179,7 @@ bool QmlDomDocument::load(QmlEngine *engine, const QByteArray &data, const QUrl d->errors << error; td->release(); return false; - } + } compiler.compile(engine, td, &component); @@ -213,7 +213,7 @@ bool QmlDomDocument::load(QmlEngine *engine, const QByteArray &data, const QUrl } /*! - Returns the last load errors. The load errors will be reset after a + Returns the last load errors. The load errors will be reset after a successful call to load(). \sa load() @@ -292,7 +292,7 @@ QmlDomDynamicPropertyPrivate::~QmlDomDynamicPropertyPrivate() /*! \class QmlDomProperty \internal - \brief The QmlDomProperty class represents one property assignment in the + \brief The QmlDomProperty class represents one property assignment in the QML DOM tree Properties in QML can be assigned QML \l {QmlDomValue}{values}. @@ -627,7 +627,7 @@ QmlDomObjectPrivate::properties() const { Properties rv; - for (QHash<QByteArray, QmlParser::Property *>::ConstIterator iter = + for (QHash<QByteArray, QmlParser::Property *>::ConstIterator iter = object->properties.begin(); iter != object->properties.end(); ++iter) { @@ -645,7 +645,7 @@ QmlDomObjectPrivate::properties(QmlParser::Property *property) const if (property->value) { - for (QHash<QByteArray, QmlParser::Property *>::ConstIterator iter = + for (QHash<QByteArray, QmlParser::Property *>::ConstIterator iter = property->value->properties.begin(); iter != property->value->properties.end(); ++iter) { @@ -655,7 +655,7 @@ QmlDomObjectPrivate::properties(QmlParser::Property *property) const } QByteArray name(property->name + "."); - for (Properties::Iterator iter = rv.begin(); iter != rv.end(); ++iter) + for (Properties::Iterator iter = rv.begin(); iter != rv.end(); ++iter) iter->second.prepend(name); } else { @@ -672,8 +672,8 @@ QmlDomObjectPrivate::properties(QmlParser::Property *property) const Each object instantiated in a QML file has a corresponding QmlDomObject node in the QML DOM. - - In addition to the type information that determines the object to + + In addition to the type information that determines the object to instantiate, QmlDomObject's also have a set of associated QmlDomProperty's. Each QmlDomProperty represents a QML property assignment on the instantiated object. For example, @@ -687,12 +687,12 @@ QGraphicsWidget { describes a single QmlDomObject - "QGraphicsWidget" - with two properties, "opacity" and "size". Obviously QGraphicsWidget has many more properties than just - these two, but the QML DOM representation only contains those assigned + these two, but the QML DOM representation only contains those assigned values (or bindings) in the QML file. The DOM tree can be modified to include new property assignments by calling QmlDomObject::addProperty(). Existing property assignments can be modified - through the QmlDomProperty::setValue() method, or removed entirely by + through the QmlDomProperty::setValue() method, or removed entirely by calling QmlDomObject::removeProperty(). */ @@ -749,9 +749,9 @@ bool QmlDomObject::isValid() const /*! Returns the fully-qualified type name of this object. - For example, the type of this object would be "Qt/4.6/Rect". + For example, the type of this object would be "Qt/4.6/Rectangle". \qml -Rect { } +Rectangle { } \endqml */ QByteArray QmlDomObject::objectType() const @@ -763,9 +763,9 @@ QByteArray QmlDomObject::objectType() const /*! Returns the type name as referenced in the qml file. - For example, the type of this object would be "Rect". + For example, the type of this object would be "Rectangle". \qml -Rect { } +Rectangle { } \endqml */ QByteArray QmlDomObject::objectClassName() const @@ -804,7 +804,7 @@ void QmlDomObject::setObjectId(const QByteArray &id) /*! - Returns the list of assigned properties on this object. + Returns the list of assigned properties on this object. In the following example, "text" and "x" properties would be returned. \qml @@ -920,8 +920,8 @@ QmlDomDynamicProperty QmlDomObject::dynamicProperty(const QByteArray &name) cons } /*! - Returns true if this object is a custom type. Custom types are special - types that allow embeddeding non-QML data, such as SVG or HTML data, + Returns true if this object is a custom type. Custom types are special + types that allow embeddeding non-QML data, such as SVG or HTML data, directly into QML files. \note Currently this method will always return false, and is a placekeeper @@ -935,7 +935,7 @@ bool QmlDomObject::isCustomType() const } /*! - Sets the custom type \a data. If this type is not a custom type, this + Sets the custom type \a data. If this type is not a custom type, this method does nothing. \sa QmlDomObject::isCustomType() QmlDomObject::customTypeData() @@ -947,8 +947,8 @@ void QmlDomObject::setCustomTypeData(const QByteArray &data) } /*! - If this object represents a custom type, returns the data associated with - the custom type, otherwise returns an empty QByteArray(). + If this object represents a custom type, returns the data associated with + the custom type, otherwise returns an empty QByteArray(). QmlDomObject::isCustomType() can be used to check if this object represents a custom type. */ @@ -958,20 +958,20 @@ QByteArray QmlDomObject::customTypeData() const } /*! - Returns true if this object is a sub-component object. Sub-component - objects can be converted into QmlDomComponent instances by calling + Returns true if this object is a sub-component object. Sub-component + objects can be converted into QmlDomComponent instances by calling QmlDomObject::toComponent(). \sa QmlDomObject::toComponent() */ bool QmlDomObject::isComponent() const { - return d->isVirtualComponent || + return d->isVirtualComponent || (d->object && d->object->typeName == "Qt/Component"); } /*! - Returns a QmlDomComponent for this object if it is a sub-component, or + Returns a QmlDomComponent for this object if it is a sub-component, or an invalid QmlDomComponent if not. QmlDomObject::isComponent() can be used to check if this object represents a sub-component. @@ -1046,7 +1046,7 @@ QmlDomBasicValuePrivate::~QmlDomBasicValuePrivate() literal values. \qml -Rect { +Rectangle { x: 10 y: 10 color: "red" @@ -1062,7 +1062,7 @@ QmlDomValueLiteral::QmlDomValueLiteral(): { } -/*! +/*! Create a copy of \a other QmlDomValueLiteral. */ QmlDomValueLiteral::QmlDomValueLiteral(const QmlDomValueLiteral &other) @@ -1091,7 +1091,7 @@ QmlDomValueLiteral &QmlDomValueLiteral::operator=(const QmlDomValueLiteral &othe In the example below, the literal value will be the string "10". \qml -Rect { x: 10 } +Rectangle { x: 10 } \endqml */ QString QmlDomValueLiteral::literal() const @@ -1118,7 +1118,7 @@ void QmlDomValueLiteral::setLiteral(const QString &value) the example below, the "x" property is being assigned a property binding. \qml -Rect { x: Other.x } +Rectangle { x: Other.x } \endqml */ @@ -1159,14 +1159,14 @@ QmlDomValueBinding &QmlDomValueBinding::operator=(const QmlDomValueBinding &othe In the example below, the string "Other.x" will be returned. \qml -Rect { x: Other.x } +Rectangle { x: Other.x } \endqml */ QString QmlDomValueBinding::binding() const { - if (d->value) + if (d->value) return d->value->value.asScript(); - else + else return QString(); } @@ -1184,13 +1184,13 @@ void QmlDomValueBinding::setBinding(const QString &expression) \internal \brief The QmlDomValueValueSource class represents a value source assignment value. - In QML, value sources are special value generating types that may be + In QML, value sources are special value generating types that may be assigned to properties. Value sources inherit the QmlPropertyValueSource - class. In the example below, the "x" property is being assigned the + class. In the example below, the "x" property is being assigned the NumberAnimation value source. \qml -Rect { +Rectangle { x: NumberAnimation { from: 0 to: 100 @@ -1239,7 +1239,7 @@ QmlDomValueValueSource &QmlDomValueValueSource::operator=(const QmlDomValueValue In the example below, an object representing the NumberAnimation will be returned. \qml -Rect { +Rectangle { x: NumberAnimation { from: 0 to: 100 @@ -1255,7 +1255,7 @@ QmlDomObject QmlDomValueValueSource::object() const if (d->value) { rv.d->object = d->value->object; rv.d->object->addref(); - } + } return rv; } @@ -1293,11 +1293,11 @@ QmlDomValuePrivate::~QmlDomValuePrivate() \internal \brief The QmlDomValue class represents a generic Qml value. - QmlDomValue's can be assigned to QML \l {QmlDomProperty}{properties}. In + QmlDomValue's can be assigned to QML \l {QmlDomProperty}{properties}. In QML, properties can be assigned various different values, including basic literals, property bindings, property value sources, objects and lists of values. The QmlDomValue class allows a programmer to determine the specific - value type being assigned and access more detailed information through a + value type being assigned and access more detailed information through a corresponding value type class. For example, in the following example, @@ -1382,7 +1382,7 @@ QmlDomValue &QmlDomValue::operator=(const QmlDomValue &other) QmlDomValue::Type QmlDomValue::type() const { if (d->property) - if (QmlMetaType::isList(d->property->type) || + if (QmlMetaType::isList(d->property->type) || QmlMetaType::isQmlList(d->property->type) || (d->property && d->property->values.count() > 1)) return List; @@ -1477,7 +1477,7 @@ QmlDomValueLiteral QmlDomValue::toLiteral() const } /*! - Returns a QmlDomValueBinding if this value is a property binding type, + Returns a QmlDomValueBinding if this value is a property binding type, otherwise returns an invalid QmlDomValueBinding. \sa QmlDomValue::type() @@ -1525,7 +1525,7 @@ QmlDomObject QmlDomValue::toObject() const } /*! - Returns a QmlDomList if this value is a list type, otherwise returns an + Returns a QmlDomList if this value is a list type, otherwise returns an invalid QmlDomList. \sa QmlDomValue::type() @@ -1574,12 +1574,12 @@ int QmlDomValue::length() const Item { children: [ Text { }, - Rect { } + Rectangle { } ] } \endqml - Lists can also be implicitly created by assigning multiple + Lists can also be implicitly created by assigning multiple \l {QmlDomValueValueSource}{value sources} or constants to a property. \qml Item { @@ -1643,7 +1643,7 @@ QList<QmlDomValue> QmlDomList::values() const return rv; } -/*! +/*! Set the list of QmlDomValue's to \a values. */ void QmlDomList::setValues(const QList<QmlDomValue> &values) @@ -1692,8 +1692,8 @@ QList<int> QmlDomList:: commaPositions() const \internal \brief The QmlDomComponent class represents sub-component within a QML document. - Sub-components are QmlComponents defined within a QML document. The - following example shows the definition of a sub-component with the id + Sub-components are QmlComponents defined within a QML document. The + following example shows the definition of a sub-component with the id "ListDelegate". \qml @@ -1764,7 +1764,7 @@ QmlDomObject QmlDomComponent::componentRoot() const rv.d->object->addref(); } else if (d->object) { QmlParser::Object *obj = 0; - if (d->object->defaultProperty && + if (d->object->defaultProperty && d->object->defaultProperty->values.count() == 1 && d->object->defaultProperty->values.at(0)->object) obj = d->object->defaultProperty->values.at(0)->object; diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index 0a05094..84c9553 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -630,7 +630,7 @@ QScriptValue QmlEnginePrivate::createComponent(QScriptContext *ctxt, Example (where targetItem is the id of an existing QML item): \code - newObject = createQmlObject('Rect {color: "red"; width: 20; height: 20}', + newObject = createQmlObject('Rectangle {color: "red"; width: 20; height: 20}', targetItem, "dynamicSnippet1"); \endcode diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp index 5632dc0..7faddee 100644 --- a/src/declarative/util/qmlanimation.cpp +++ b/src/declarative/util/qmlanimation.cpp @@ -176,7 +176,7 @@ QmlAbstractAnimation::QmlAbstractAnimation(QmlAbstractAnimationPrivate &dd, QObj whenever the \l MouseRegion is pressed. \code - Rect { + Rectangle { width: 100; height: 100 x: NumberAnimation { running: MyMouse.pressed @@ -362,7 +362,7 @@ void QmlAbstractAnimation::setAlwaysRunToEnd(bool f) In the following example, the rectangle will spin indefinately. \code - Rect { + Rectangle { rotation: NumberAnimation { running: true; repeat: true; from: 0 to: 360 } } \endcode @@ -541,7 +541,7 @@ void QmlAbstractAnimation::resume() Normally \c stop() stops the animation immediately, and the animation has no further influence on property values. In this example animation \code - Rect { + Rectangle { x: NumberAnimation { from: 0; to: 100; duration: 500 } } \endcode @@ -579,7 +579,7 @@ void QmlAbstractAnimation::restart() Unlike \c stop(), \c complete() immediately fast-forwards the animation to its end. In the following example, \code - Rect { + Rectangle { x: NumberAnimation { from: 0; to: 100; duration: 500 } } \endcode diff --git a/src/declarative/util/qmlfollow.cpp b/src/declarative/util/qmlfollow.cpp index 1fb321c..c48684b 100644 --- a/src/declarative/util/qmlfollow.cpp +++ b/src/declarative/util/qmlfollow.cpp @@ -212,7 +212,7 @@ void QmlFollowPrivate::stop() In example below, Rect2 will follow Rect1 moving with a velocity of up to 200: \code - Rect { + Rectangle { id: Rect1 width: 20; height: 20 color: "#00ff00" @@ -228,7 +228,7 @@ void QmlFollowPrivate::stop() PauseAnimation { duration: 1000 } } } - Rect { + Rectangle { id: Rect2 x: Rect1.width width: 20; height: 20 diff --git a/src/declarative/util/qmlpalette.cpp b/src/declarative/util/qmlpalette.cpp index d500986..d86f98f 100644 --- a/src/declarative/util/qmlpalette.cpp +++ b/src/declarative/util/qmlpalette.cpp @@ -64,7 +64,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Palette,QmlPalette) \code Palette { id: MyPalette; colorGroup: Qt.Active } - Rect { + Rectangle { width: 640; height: 480 color: MyPalette.window Text { |