diff options
Diffstat (limited to 'src/doc/src')
| -rw-r--r-- | src/doc/src/declarative/example-slideswitch.qdoc | 2 | ||||
| -rw-r--r-- | src/doc/src/demos/qml-qtbubblelevel.qdoc | 2 | ||||
| -rw-r--r-- | src/doc/src/examples/qml-extending.qdoc | 2 | ||||
| -rw-r--r-- | src/doc/src/getting-started/gettingstartedqml.qdoc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/doc/src/declarative/example-slideswitch.qdoc b/src/doc/src/declarative/example-slideswitch.qdoc index cffde0f2..b294a83a 100644 --- a/src/doc/src/declarative/example-slideswitch.qdoc +++ b/src/doc/src/declarative/example-slideswitch.qdoc @@ -119,7 +119,7 @@ For more information on scripts see \l{Integrating JavaScript}. \snippet examples/declarative/ui-components/slideswitch/content/Switch.qml 7 At this point, when the switch toggles between the two states the knob will instantly change its \c x position between 1 and 78. -In order for the the knob to move smoothly we add a transition that will animate the \c x property with an easing curve for a duration of 200ms. +In order for the knob to move smoothly we add a transition that will animate the \c x property with an easing curve for a duration of 200ms. For more information on transitions see \l{QML Animation and Transitions}. diff --git a/src/doc/src/demos/qml-qtbubblelevel.qdoc b/src/doc/src/demos/qml-qtbubblelevel.qdoc index ea634e24..b4f85fca 100644 --- a/src/doc/src/demos/qml-qtbubblelevel.qdoc +++ b/src/doc/src/demos/qml-qtbubblelevel.qdoc @@ -101,7 +101,7 @@ Projects Forum Nokia: https://projects.forum.nokia.com/qtbubblelevel \snippet demos/mobile/qtbubblelevel/qml/BubbleLevel.qml 0 - The Tube element represents the the glass tube of the bubble level. It is anchored to the centre of the wooden board. The width and height are calculated with specific factors to make the glass tube scale to different resolutions. + The Tube element represents the glass tube of the bubble level. It is anchored to the center of the wooden board. The width and height are calculated with specific factors to make the glass tube scale to different resolutions. \snippet demos/mobile/qtbubblelevel/qml/BubbleLevel.qml 1 diff --git a/src/doc/src/examples/qml-extending.qdoc b/src/doc/src/examples/qml-extending.qdoc index f1b4eada..68ed2936 100644 --- a/src/doc/src/examples/qml-extending.qdoc +++ b/src/doc/src/examples/qml-extending.qdoc @@ -137,7 +137,7 @@ behavior. \section2 Define People as a base class -The implementation of the People class itself has not changed since the the +The implementation of the People class itself has not changed since the previous example. However, as we have repurposed the People class as a common base for Boy and Girl, we want to prevent it from being instantiated from QML directly - an explicit Boy or Girl should be instantiated instead. diff --git a/src/doc/src/getting-started/gettingstartedqml.qdoc b/src/doc/src/getting-started/gettingstartedqml.qdoc index 1880c01a..6522c139 100644 --- a/src/doc/src/getting-started/gettingstartedqml.qdoc +++ b/src/doc/src/getting-started/gettingstartedqml.qdoc @@ -95,7 +95,7 @@ This simple rectangle has a unique identifier, \c simplebutton, which is bound to the id property. The \c Rectangle element's properties are bound to values by listing the property, followed by a colon, then the value. In the code sample, the color \c grey - is bound to the the Rectangle's \c color property. Similarly, we bind the \c width + is bound to the Rectangle's \c color property. Similarly, we bind the \c width and \c height of the Rectangle. The \l {Text}{Text} element is a non-editable text field. We name this \c Text element |