aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@digia.com>2013-01-11 12:40:19 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-14 10:25:48 +0100
commitbe456a3b976ed1f2b74cf5cf35200689bd29f893 (patch)
treeb0869e40c3ec22ff119eb1e132d94844e670d077 /src
parent83deab8d1b82bb3a02b0b92737b298848d19beb6 (diff)
Doc: correcting typo "the the"
Task-number: QTBUG-28756 Spurious repetition of the definite article Doc: corrected trailing space issue. Change-Id: I95c1c5773dc4b25dd0a3625343a67975783435fd Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/particles/qquickspritegoal.cpp2
-rw-r--r--src/qml/doc/src/modules/legacymodules.qdoc2
-rw-r--r--src/qml/qml/qqmlcomponent.cpp2
-rw-r--r--src/quick/doc/src/appdevguide/qtquicktest.qdoc2
-rw-r--r--src/quick/items/context2d/qquickcontext2d.cpp10
-rw-r--r--src/quick/items/qquickitemviewtransition.cpp2
-rw-r--r--src/quick/util/qquickanimation.cpp2
-rw-r--r--src/quick/util/qquicklistcompositor.cpp2
8 files changed, 12 insertions, 12 deletions
diff --git a/src/particles/qquickspritegoal.cpp b/src/particles/qquickspritegoal.cpp
index ddb68caf19..4e62de55be 100644
--- a/src/particles/qquickspritegoal.cpp
+++ b/src/particles/qquickspritegoal.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
\inqmlmodule QtQuick.Particles 2
\ingroup qtquick-images-sprites
\inherits Affector
- \brief For changing the the state of a sprite particle
+ \brief For changing the state of a sprite particle
*/
/*!
diff --git a/src/qml/doc/src/modules/legacymodules.qdoc b/src/qml/doc/src/modules/legacymodules.qdoc
index e5ea830abf..26981334b7 100644
--- a/src/qml/doc/src/modules/legacymodules.qdoc
+++ b/src/qml/doc/src/modules/legacymodules.qdoc
@@ -75,7 +75,7 @@ following semantics apply to located legacy modules:
the located legacy module
\endlist
-A located legacy module may reside on the the local file system or on the
+A located legacy module may reside on the local file system or on the
network and can be referred to by a URL that specifies the file system path or
network URL.
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index 869853063f..1928bcb4b5 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -794,7 +794,7 @@ QObject *QQmlComponent::create(QQmlContext *context)
When QQmlComponent constructs an instance, it occurs in three steps:
\list 1
\li The object hierarchy is created, and constant values are assigned.
- \li Property bindings are evaluated for the the first time.
+ \li Property bindings are evaluated for the first time.
\li If applicable, QQmlParserStatus::componentComplete() is called on objects.
\endlist
QQmlComponent::beginCreate() differs from QQmlComponent::create() in that it
diff --git a/src/quick/doc/src/appdevguide/qtquicktest.qdoc b/src/quick/doc/src/appdevguide/qtquicktest.qdoc
index 8198281302..bf8ca86959 100644
--- a/src/quick/doc/src/appdevguide/qtquicktest.qdoc
+++ b/src/quick/doc/src/appdevguide/qtquicktest.qdoc
@@ -96,7 +96,7 @@
\endcode
If your test case needs QML imports, then you can add them as
- \c{-import} options to the the test program command-line by adding
+ \c{-import} options to the test program command-line by adding
the following line to your .pro file:
\code
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index b4b622cb4e..a46cd6ab70 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -714,7 +714,7 @@ static v8::Handle<v8::Value> ctx2d_shear(const v8::Arguments &args)
/*!
\qmlproperty real QtQuick2::Context2D::globalAlpha
- Holds the the current alpha value applied to rendering operations.
+ Holds the current alpha value applied to rendering operations.
The value must be in the range from 0.0 (fully transparent) to 1.0 (fully opque).
The default value is 1.0.
*/
@@ -744,7 +744,7 @@ static void ctx2d_globalAlpha_set(v8::Local<v8::String>, v8::Local<v8::Value> va
/*!
\qmlproperty string QtQuick2::Context2D::globalCompositeOperation
- Holds the the current the current composition operation, from the list below:
+ Holds the current the current composition operation, from the list below:
\list
\li source-atop - A atop B. Display the source image wherever both images are opaque.
Display the destination image wherever the destination image is opaque but the source image is transparent.
@@ -1239,7 +1239,7 @@ static v8::Handle<v8::Value> ctx2d_createPattern(const v8::Arguments &args)
// line styles
/*!
\qmlproperty string QtQuick2::Context2D::lineCap
- Holds the the current line cap style.
+ Holds the current line cap style.
The possible line cap styles are:
\list
\li butt - the end of each line has a flat edge perpendicular to the direction of the line, this is the default line cap value.
@@ -1294,7 +1294,7 @@ static void ctx2d_lineCap_set(v8::Local<v8::String>, v8::Local<v8::Value> value,
/*!
\qmlproperty string QtQuick2::Context2D::lineJoin
- Holds the the current line join style. A join exists at any point in a subpath
+ Holds the current line join style. A join exists at any point in a subpath
shared by two consecutive lines. When a subpath is closed, then a join also exists
at its first point (equivalent to its last point) connecting the first and last lines in the subpath.
@@ -1352,7 +1352,7 @@ static void ctx2d_lineJoin_set(v8::Local<v8::String>, v8::Local<v8::Value> value
/*!
\qmlproperty real QtQuick2::Context2D::lineWidth
- Holds the the current line width. Values that are not finite values greater than zero are ignored.
+ Holds the current line width. Values that are not finite values greater than zero are ignored.
*/
v8::Handle<v8::Value> ctx2d_lineWidth(v8::Local<v8::String>, const v8::AccessorInfo &info)
{
diff --git a/src/quick/items/qquickitemviewtransition.cpp b/src/quick/items/qquickitemviewtransition.cpp
index 77c0f620a3..c1cc7c99e0 100644
--- a/src/quick/items/qquickitemviewtransition.cpp
+++ b/src/quick/items/qquickitemviewtransition.cpp
@@ -868,7 +868,7 @@ QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent)
/*!
\qmlattachedproperty list QtQuick2::ViewTransition::item
- This attached property holds the the item that is being transitioned.
+ This attached property holds the item that is being transitioned.
\warning This item should not be kept and referred to outside of the transition
as it may become invalid as the view changes.
diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp
index d341962e3f..8bbd3a788a 100644
--- a/src/quick/util/qquickanimation.cpp
+++ b/src/quick/util/qquickanimation.cpp
@@ -918,7 +918,7 @@ void QQuickScriptAction::setScript(const QQmlScriptString &script)
/*!
\qmlproperty string QtQuick2::ScriptAction::scriptName
- This property holds the the name of the StateChangeScript to run.
+ This property holds the name of the StateChangeScript to run.
This property is only valid when ScriptAction is used as part of a transition.
If both script and scriptName are set, scriptName will be used.
diff --git a/src/quick/util/qquicklistcompositor.cpp b/src/quick/util/qquicklistcompositor.cpp
index 41c5d21782..a9e9acee23 100644
--- a/src/quick/util/qquicklistcompositor.cpp
+++ b/src/quick/util/qquicklistcompositor.cpp
@@ -336,7 +336,7 @@ inline QQuickListCompositor::Range *QQuickListCompositor::erase(
}
/*!
- Sets the the number (\a count) of possible groups that items may belong to in a compositor.
+ Sets the number (\a count) of possible groups that items may belong to in a compositor.
*/
void QQuickListCompositor::setGroupCount(int count)