aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@digia.com>2013-03-25 12:37:22 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-26 22:45:31 +0100
commit363385a549f33b2b0a34ac9cc8149376f456655c (patch)
treeff7da1b3cbae0f42666a3cc30d26e32781f6dbbd /examples/quick
parentaaa8fd67a499b75f8ec3dc4eea2b53bbdeff11d2 (diff)
Doc: Fixed some uses of terminolgies in qdoc files.
-"element" -> "type" or "object" (not in all cases where this change applies) -some instances of QtQuick. It should be "Qt Quick". -only in qdoc files. Examples and source code changes will be done later. Task-number: QTBUG-30180 Change-Id: Ie587461a138e97606f761ad1e90909c91b479303 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'examples/quick')
-rw-r--r--examples/quick/accessibility/doc/src/accessibility.qdoc5
-rw-r--r--examples/quick/animation/doc/src/animation.qdoc4
-rw-r--r--examples/quick/canvas/doc/src/canvas.qdoc3
-rw-r--r--examples/quick/doc/src/qml-extending.qdoc16
-rw-r--r--examples/quick/imageelements/doc/src/imageelements.qdoc7
-rw-r--r--examples/quick/mousearea/doc/src/mousearea.qdoc7
-rw-r--r--examples/quick/painteditem/textballoons/doc/src/textballoons.qdoc7
-rw-r--r--examples/quick/particles/affectors/doc/src/affectors.qdoc5
-rw-r--r--examples/quick/particles/emitters/doc/src/emitters.qdoc4
-rw-r--r--examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc2
-rw-r--r--examples/quick/particles/system/doc/src/system.qdoc11
-rw-r--r--examples/quick/positioners/doc/src/positioners.qdoc3
-rw-r--r--examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc5
-rw-r--r--examples/quick/shadereffects/doc/src/shadereffects.qdoc5
-rw-r--r--examples/quick/text/doc/src/text.qdoc16
-rw-r--r--examples/quick/threading/doc/src/threading.qdoc2
-rw-r--r--examples/quick/touchinteraction/doc/src/touchinteraction.qdoc7
-rw-r--r--examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc2
-rw-r--r--examples/quick/views/doc/src/views.qdoc3
19 files changed, 51 insertions, 63 deletions
diff --git a/examples/quick/accessibility/doc/src/accessibility.qdoc b/examples/quick/accessibility/doc/src/accessibility.qdoc
index 9054b5e394..58de9c5683 100644
--- a/examples/quick/accessibility/doc/src/accessibility.qdoc
+++ b/examples/quick/accessibility/doc/src/accessibility.qdoc
@@ -30,12 +30,11 @@
\brief This example has accessible buttons.
\ingroup qtquickexamples
- Elements in this example are augmented with meta-data for accessiblity systems.
+ Types in this example are augmented with meta-data for accessiblity systems.
For example, the button identifies itself and its functionality to the accessibility system:
\snippet quick/accessibility/content/Button.qml button
- As do Text elements inside the example:
+ As do Text types inside the example:
\snippet quick/accessibility/accessibility.qml text
*/
-
diff --git a/examples/quick/animation/doc/src/animation.qdoc b/examples/quick/animation/doc/src/animation.qdoc
index 2b41fd71bc..993a4fb01b 100644
--- a/examples/quick/animation/doc/src/animation.qdoc
+++ b/examples/quick/animation/doc/src/animation.qdoc
@@ -33,7 +33,7 @@
\ingroup qtquickexamples
This is a collection of small QML examples relating to animation. Each example is
- a small QML file emphasizing a particular element or feature.
+ a small QML file emphasizing a particular type or feature.
ColorAnimation demonstrates using a color animation to fade a sky from day to night.
\snippet quick/animation/basics/color-animation.qml 0
@@ -59,7 +59,7 @@
States demonstrates how the properties of an item can vary between states.
It defines several states:
\snippet quick/animation/states/states.qml 0
- Note that there is also the implicit 'base state' from properties set directly on elements.
+ Note that there is also the implicit 'base state' from properties set directly on objects.
Transitions takes the States example and animates the property changes by setting transitions:
\snippet quick/animation/states/transitions.qml 0
diff --git a/examples/quick/canvas/doc/src/canvas.qdoc b/examples/quick/canvas/doc/src/canvas.qdoc
index 8da29e2780..099ee174a8 100644
--- a/examples/quick/canvas/doc/src/canvas.qdoc
+++ b/examples/quick/canvas/doc/src/canvas.qdoc
@@ -33,7 +33,7 @@
\ingroup qtquickexamples
This is a collection of small QML examples relating to Canvas item. Each example is
- a small QML file emphasizing a particular element or feature.
+ a small QML file emphasizing a particular type or feature.
Red heart demonstrates using a bezierCurve API to stroke and fill a red heart.
\snippet quick/canvas/bezierCurve/bezierCurve.qml 0
@@ -56,4 +56,3 @@
\snippet quick/canvas/tiger/tiger.qml 0
*/
-
diff --git a/examples/quick/doc/src/qml-extending.qdoc b/examples/quick/doc/src/qml-extending.qdoc
index 2920398de1..0b032c60fc 100644
--- a/examples/quick/doc/src/qml-extending.qdoc
+++ b/examples/quick/doc/src/qml-extending.qdoc
@@ -31,17 +31,17 @@
\brief Exporting C++ Classes
\ingroup qmlextendingexamples
-The Adding Types Example shows how to add a new element type, \c Person, to QML.
+The Adding Types Example shows how to add a new object type, \c Person, to QML.
The \c Person type can be used from QML like this:
\snippet qml/referenceexamples/adding/example.qml 0
\section1 Declare the Person class
-All QML elements map to C++ types. Here we declare a basic C++ Person class
+All QML types map to C++ types. Here we declare a basic C++ Person class
with the two properties we want accessible on the QML type - name and shoeSize.
Although in this example we use the same name for the C++ class as the QML
-element, the C++ class can be named differently, or appear in a namespace.
+type, the C++ class can be named differently, or appear in a namespace.
\snippet qml/referenceexamples/adding/person.h 0
@@ -74,7 +74,7 @@ This example builds on:
\endlist
The Object and List Property Types example shows how to add object and list
-properties in QML. This example adds a BirthdayParty element that specifies
+properties in QML. This example adds a BirthdayParty type that specifies
a birthday party, consisting of a celebrant and a list of guests. People are
specified using the People QML type built in the previous example.
@@ -125,8 +125,8 @@ This example builds on:
\endlist
The Inheritance and Coercion Example shows how to use base classes to assign
-elements of more than one type to a property. It specializes the Person element
-developed in the previous examples into two elements - a \c Boy and a \c Girl.
+types of more than one type to a property. It specializes the Person type
+developed in the previous examples into two types - a \c Boy and a \c Girl.
\snippet qml/referenceexamples/coercion/example.qml 0
@@ -164,7 +164,7 @@ and their QML name with the QML engine.
\section1 Running the example
-The BirthdayParty element has not changed since the previous example. The
+The BirthdayParty type has not changed since the previous example. The
celebrant and guests property still use the People type.
\snippet qml/referenceexamples/coercion/birthdayparty.h 0
@@ -204,7 +204,7 @@ The only difference between this example and the last, is the addition of the
\snippet qml/referenceexamples/default/birthdayparty.h 0
The default property specifies the property to assign to whenever an explicit
-property is not specified, in the case of the BirthdayParty element the guest
+property is not specified, in the case of the BirthdayParty type the guest
property. It is purely a syntactic simplification, the behavior is identical
to specifying the property by name, but it can add a more natural feel in many
situations. The default property must be either an object or list property.
diff --git a/examples/quick/imageelements/doc/src/imageelements.qdoc b/examples/quick/imageelements/doc/src/imageelements.qdoc
index abd5f332e5..cae5d20134 100644
--- a/examples/quick/imageelements/doc/src/imageelements.qdoc
+++ b/examples/quick/imageelements/doc/src/imageelements.qdoc
@@ -27,11 +27,11 @@
/*!
\title QML Examples - Image Elements
\example quick/imageelements
- \brief This is a collection of QML examples relating to image elements.
+ \brief This is a collection of QML examples relating to image types.
\image qml-imageelements-example.png
\ingroup qtquickexamples
- This is a collection of small QML examples relating to image elements.
+ This is a collection of small QML examples relating to image types.
'BorderImage' shows off the various scaling modes of the BorderImage item
by setting its horizontalTileMode and verticalTileMode properties.
@@ -43,7 +43,7 @@
\snippet quick/imageelements/content/ShadowRectangle.qml shadow
'AnimatedSprite' shows how to display a simple animation using an
- AnimatedSprite element:
+ AnimatedSprite object:
\snippet quick/imageelements/animatedsprite.qml sprite
The sprite animation will loop 3 times.
@@ -57,4 +57,3 @@
\snippet quick/imageelements/spritesequence.qml animation
At the end of the animation the bear is set back to its initial state.
*/
-
diff --git a/examples/quick/mousearea/doc/src/mousearea.qdoc b/examples/quick/mousearea/doc/src/mousearea.qdoc
index 10f92e689e..3e026da374 100644
--- a/examples/quick/mousearea/doc/src/mousearea.qdoc
+++ b/examples/quick/mousearea/doc/src/mousearea.qdoc
@@ -27,21 +27,20 @@
/*!
\title QtQuick Examples - MouseArea
\example quick/mousearea
- \brief This is an example of the MouseArea element in QML
+ \brief This is an example of the MouseArea type in QML
\image qml-mousearea-example.png
\ingroup qtquickexamples
This example shows you how to respond to clicks and drags with a MouseArea.
- When you click inside the red square, the Text element will list several properties
+ When you click inside the red square, the Text type will list several properties
of that click which are available to QML.
Signals are emitted by the MouseArea when clicks or other discrete operations occur within it
\snippet quick/mousearea/mousearea.qml clicks
- The MouseArea can also be used to drag elements around. By setting the parameters of the drag property,
+ The MouseArea can also be used to drag items around. By setting the parameters of the drag property,
the target item will be dragged around if the user starts to drag within the MouseArea.
\snippet quick/mousearea/mousearea.qml drag
*/
-
diff --git a/examples/quick/painteditem/textballoons/doc/src/textballoons.qdoc b/examples/quick/painteditem/textballoons/doc/src/textballoons.qdoc
index 6f1d751a5f..fff7f2147d 100644
--- a/examples/quick/painteditem/textballoons/doc/src/textballoons.qdoc
+++ b/examples/quick/painteditem/textballoons/doc/src/textballoons.qdoc
@@ -62,7 +62,7 @@
To implement a QQuickPaintedItem you must implement QQuickPaintedIem's pure
virtual function \l {QQuickPaintedItem::}{paint()} which implements the
- painting of the element.
+ painting of the type.
\section1 TextBalloon Class Definition
@@ -92,7 +92,7 @@
\snippet quick/customitems/painteditem/textballoons.qml 0
- The balloonModel contains two elements at application start which will be
+ The balloonModel contains two types at application start which will be
displayed by the balloonView. The balloonView alernates the TextBalloon
delegate items between left-aligned and right-aligned.
@@ -102,7 +102,6 @@
The controls part of the UI contains a rectangle with a MouseArea which
changes color when the mouse hovers over it. This control 'button' adds
- a new element to the end of the model with a random width.
+ a new object to the end of the model with a random width.
*/
-
diff --git a/examples/quick/particles/affectors/doc/src/affectors.qdoc b/examples/quick/particles/affectors/doc/src/affectors.qdoc
index 977eb8ea95..999afe1509 100644
--- a/examples/quick/particles/affectors/doc/src/affectors.qdoc
+++ b/examples/quick/particles/affectors/doc/src/affectors.qdoc
@@ -32,7 +32,7 @@
\image qml-affectors-example.png
This is a collection of small QML examples relating to using Affectors in the particle system.
- Each example is a small QML file emphasizing a particular element or feature.
+ Each example is a small QML file emphasizing a particular type or feature.
Age demonstrates using an Age affector to prematurely end the lives of particles.
\snippet quick/particles/affectors/content/age.qml 0
@@ -78,7 +78,7 @@
moves into the lit group after 100ms.
\snippet quick/particles/affectors/content/groupgoal.qml lit
The lit group also has TrailEmitters on it for additional fire and smoke, but does not transition anywhere.
- There are two more GroupGoal elements that allow particles in the unlit group to transition to the lighting group
+ There are two more GroupGoal objects that allow particles in the unlit group to transition to the lighting group
(and then to the lit group).
\snippet quick/particles/affectors/content/groupgoal.qml groupgoal-pilot
The first is just an area bound to the location of an image of a pilot flame. When unlit balls pass through the flame,
@@ -110,4 +110,3 @@
\snippet quick/particles/affectors/content/wander.qml 0
There are different movements given by applying the Wander to different attributes of the trajectory, so the example makes it easy to play around and see the difference.
*/
-
diff --git a/examples/quick/particles/emitters/doc/src/emitters.qdoc b/examples/quick/particles/emitters/doc/src/emitters.qdoc
index 5644ab1af3..70a78e92f1 100644
--- a/examples/quick/particles/emitters/doc/src/emitters.qdoc
+++ b/examples/quick/particles/emitters/doc/src/emitters.qdoc
@@ -31,7 +31,7 @@
\image qml-emitters-example.png
This is a collection of small QML examples relating to using Emitters in the particle system.
- Each example is a small QML file emphasizing a particular element or feature.
+ Each example is a small QML file emphasizing a particular type or feature.
Velocity from motion gives the effect of strong particle motion through primarily moving the emitters:
\snippet quick/particles/emitters/content/velocityfrommotion.qml 0
@@ -54,7 +54,7 @@
\snippet quick/particles/emitters/content/shapeanddirection.qml 0
This sends the particles towards the center of the ellipse with proportional speed, keeping the ellipse outline as they move to the center.
- TrailEmitter uses that element to add smoke particles to trail the fire particles in the scene.
+ TrailEmitter uses that type to add smoke particles to trail the fire particles in the scene.
\snippet quick/particles/emitters/content/customemitter.qml 0
*/
diff --git a/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc
index 1de194b962..ac05124ae0 100644
--- a/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc
+++ b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc
@@ -32,7 +32,7 @@
\image qml-imageparticle-example.png
This is a collection of small QML examples relating to using Affectors in the particle system.
- Each example is a small QML file emphasizing a particular element or feature.
+ Each example is a small QML file emphasizing a particular type or feature.
All at once shows off several of the features of ImageParticle at the same time.
\snippet quick/particles/imageparticle/content/allatonce.qml 0
diff --git a/examples/quick/particles/system/doc/src/system.qdoc b/examples/quick/particles/system/doc/src/system.qdoc
index a01b014f4b..f96ff49937 100644
--- a/examples/quick/particles/system/doc/src/system.qdoc
+++ b/examples/quick/particles/system/doc/src/system.qdoc
@@ -32,15 +32,15 @@
\image qml-system-example.png
This is a collection of small QML examples relating to using Affectors in the particle system.
- Each example is a small QML file emphasizing a particular element or feature.
+ Each example is a small QML file emphasizing a particular type or feature.
- Dynamic comparison compares using the particle system to getting a similar effect with the following code that dynamically instantiates Image elements.
+ Dynamic comparison compares using the particle system to getting a similar effect with the following code that dynamically instantiates Image types.
\snippet quick/particles/system/content/dynamiccomparison.qml fake
- Note how the Image elements are not able to be randomly colorized.
+ Note how the Image objects are not able to be randomly colorized.
Start and Stop simply sets the running and paused states of a ParticleSystem. While the system does not perform any simulation when stopped or paused, a restart restarts the simulation from the beginning, while unpausing resumes the simulation from where it was.
- Timed group changes is an example that highlights the ParticleGroup element. While normally referring to groups with a string name is sufficent, additional effects can be
+ Timed group changes is an example that highlights the ParticleGroup type. While normally referring to groups with a string name is sufficent, additional effects can be
done by setting properties on groups.
The first group has a variable duration on it, but always transitions to the second group.
\snippet quick/particles/system/content/timedgroupchanges.qml 0
@@ -53,7 +53,6 @@
\snippet quick/particles/system/content/dynamicemitters.qml 0
Note that this effect, a flurry of flying rainbow spears, would be better served with TrailEmitter. It is only done with dynamic emitters in this example to show the concept more simply.
- Multiple Painters shows how to control paint ordering of individual particles. While the paint ordering of particles within one ImagePainter is not strictly defined, ImageParticle elements follow the normal Z-ordering rules for QtQuick items. This example allow you to paint the inside of the particles above the black borders using a pair of ImageParticles each painting different parts of the same logical particle.
+ Multiple Painters shows how to control paint ordering of individual particles. While the paint ordering of particles within one ImagePainter is not strictly defined, ImageParticle objects follow the normal Z-ordering rules for QtQuick items. This example allow you to paint the inside of the particles above the black borders using a pair of ImageParticles each painting different parts of the same logical particle.
*/
-
diff --git a/examples/quick/positioners/doc/src/positioners.qdoc b/examples/quick/positioners/doc/src/positioners.qdoc
index 8dd7de193c..d61dc81b30 100644
--- a/examples/quick/positioners/doc/src/positioners.qdoc
+++ b/examples/quick/positioners/doc/src/positioners.qdoc
@@ -32,7 +32,7 @@
\ingroup qtquickexamples
This is a collection of small QML examples relating to positioners. Each example is
- a small QML file emphasizing a particular element or feature.
+ a small QML file emphasizing a particular type or feature.
Transitions shows animated transitions when showing or hiding items in a positioner.
It consists of a scene populated with items in a variety of positioners: Column, Row, Grid and Flow.
@@ -50,4 +50,3 @@
Attached Properties shows how the Positioner attached property can be used to determine where an item is within a positioner.
\snippet quick/positioners/positioners-attachedproperties.qml 0
*/
-
diff --git a/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc b/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc
index d99deb754f..dbc4d59470 100644
--- a/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc
+++ b/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc
@@ -186,8 +186,8 @@
\snippet quick/scenegraph/customgeometry/main.qml 1
Our .qml file imports the \c {QtQuick 2.0} module to get the
- standard elements and also our own \c {CustomGeometry 1.0} module
- which contains our newly created BezierCurve element.
+ standard types and also our own \c {CustomGeometry 1.0} module
+ which contains our newly created BezierCurve objects.
\snippet quick/scenegraph/customgeometry/main.qml 2
@@ -205,4 +205,3 @@
Finally we overlay a short text outlining what the example shows.
*/
-
diff --git a/examples/quick/shadereffects/doc/src/shadereffects.qdoc b/examples/quick/shadereffects/doc/src/shadereffects.qdoc
index b8b5459c29..fdc80a05c0 100644
--- a/examples/quick/shadereffects/doc/src/shadereffects.qdoc
+++ b/examples/quick/shadereffects/doc/src/shadereffects.qdoc
@@ -34,9 +34,9 @@
This example demonstrates a couple of visual effects that you can perform
with shaders in QtQuick 2.0
- ShaderEffects typically operate on other elements, using a ShaderEffectSource
+ ShaderEffects typically operate on other types, using a ShaderEffectSource
\snippet quick/shadereffects/shadereffects.qml source
- In the above snippet, theItem is the id of a complex QML element in the file.
+ In the above snippet, theItem is the id of a complex QML object in the file.
ShaderEffects can use this ShaderEffectSource as a texture in their fragment shader.
\snippet quick/shadereffects/shadereffects.qml fragment
@@ -49,4 +49,3 @@
provides more vertices for you to manipulate, enabling many effects.
\snippet quick/shadereffects/shadereffects.qml vertex
*/
-
diff --git a/examples/quick/text/doc/src/text.qdoc b/examples/quick/text/doc/src/text.qdoc
index fd5d32f5cd..82d142988b 100644
--- a/examples/quick/text/doc/src/text.qdoc
+++ b/examples/quick/text/doc/src/text.qdoc
@@ -32,18 +32,18 @@
\ingroup qtquickexamples
This is a collection of small QML examples relating to text. Each example is
- a small QML file, usually containing or emphasizing a particular element or
+ a small QML file, usually containing or emphasizing a particular type or
feature. You can run and observe the behavior of each example.
- 'Hello' shows how to change and animate the letter spacing of a Text element.
+ 'Hello' shows how to change and animate the letter spacing of a Text type.
It uses a sequential animation to first animate the font.letterSpacing property
from 0 to 50 over 3 seconds and then move the text to a random position on screen:
\snippet quick/text/fonts/hello.qml letterspacing
- 'Fonts' shows different ways of using fonts with the Text element.
+ 'Fonts' shows different ways of using fonts with the Text type.
Simply by name, using the font.family property directly:
\snippet quick/text/fonts/fonts.qml name
- or using a FontLoader element:
+ or using a FontLoader type:
\snippet quick/text/fonts/fonts.qml fontloader
or using a FontLoader and specifying a local font file:
\snippet quick/text/fonts/fonts.qml fontloaderlocal
@@ -52,18 +52,18 @@
'Available Fonts' shows how to use the QML global Qt object and a list view
to display all the fonts available on the system.
- The ListView element uses the list of fonts available as its model:
+ The ListView type uses the list of fonts available as its model:
\snippet quick/text/fonts/availableFonts.qml model
Inside the delegate, the font family is set with the modelData:
\snippet quick/text/fonts/availableFonts.qml delegate
'Banner' is a simple example showing how to create a banner using a row of text
- elements and a NumberAnimation.
+ types and a NumberAnimation.
- 'Img tag' shows different ways of displaying images in a text elements using
+ 'Img tag' shows different ways of displaying images in a text types using
the <img> tag.
- 'Text Layout' shows how to create a more complex layout for a text element.
+ 'Text Layout' shows how to create a more complex layout for a text item.
This example lays out the text in two columns using the onLineLaidOut handler
that allows you to position and resize each line:
\snippet quick/text/styledtext-layout.qml layout
diff --git a/examples/quick/threading/doc/src/threading.qdoc b/examples/quick/threading/doc/src/threading.qdoc
index b87cb1b952..3ed8c33c6f 100644
--- a/examples/quick/threading/doc/src/threading.qdoc
+++ b/examples/quick/threading/doc/src/threading.qdoc
@@ -44,6 +44,6 @@
\snippet quick/threading/workerscript/workerscript.qml 0
The workerscript then is free to take a really long time to calculate it:
\snippet quick/threading/workerscript/workerscript.js 0
- When it's done, the result returns to the main scene via the WorkerScript element:
+ When it's done, the result returns to the main scene via the WorkerScript type:
\snippet quick/threading/workerscript/workerscript.qml 1
*/
diff --git a/examples/quick/touchinteraction/doc/src/touchinteraction.qdoc b/examples/quick/touchinteraction/doc/src/touchinteraction.qdoc
index 54f94383e4..8515b14abf 100644
--- a/examples/quick/touchinteraction/doc/src/touchinteraction.qdoc
+++ b/examples/quick/touchinteraction/doc/src/touchinteraction.qdoc
@@ -47,10 +47,9 @@
to user input.
\snippet quick/touchinteraction/pincharea/flickresize.qml 0
- Flickable is a simple example demonstrating the Flickable element. The element inside the flickable is very big, but the flickable itself is very small:
+ Flickable is a simple example demonstrating the Flickable type. The object inside the flickable is very big, but the flickable itself is very small:
\snippet quick/touchinteraction/flickable/basic-flickable.qml 0
- Corkboards shows a more complex Flickable usecase, with elements on the flickable that respond to mouse and keyboard interaction.
- This doesn't require special code, the QtQuick elements automatically cooperate with Flickable for accepting the touch events.
+ Corkboards shows a more complex Flickable usecase, with types on the flickable that respond to mouse and keyboard interaction.
+ This doesn't require special code, the Qt Quick types automatically cooperate with Flickable for accepting the touch events.
*/
-
diff --git a/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc b/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc
index 6ec2360287..1ebe7eb9f5 100644
--- a/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc
+++ b/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc
@@ -36,7 +36,7 @@ This example shows how to create a reusable switch component in QML.
The code for this example can be found in the \c examples/quick/ui-components/slideswitch directory.
-The elements that compose the switch are:
+The objects that compose the switch are:
\list
\li a \c on property (the interface to interact with the switch),
diff --git a/examples/quick/views/doc/src/views.qdoc b/examples/quick/views/doc/src/views.qdoc
index 658e51c8fc..d79f9b0b3e 100644
--- a/examples/quick/views/doc/src/views.qdoc
+++ b/examples/quick/views/doc/src/views.qdoc
@@ -34,7 +34,7 @@
This is a collection of small QML examples relating to model and view functionality. They demonstrate how to show data from a model using the QtQuick view types.
- \section2 GridView and PathView demonstrate usage of these elements to display views.
+ \section2 GridView and PathView demonstrate usage of these types to display views.
\snippet quick/views/gridview/gridview-example.qml 0
\section2 Dynamic List demonstrates animation of runtime additions and removals to a ListView.
@@ -80,4 +80,3 @@
\snippet quick/views/visualitemmodel/visualitemmodel.qml 0
*/
-