diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-04 20:25:54 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-05 11:03:10 +0100 |
| commit | 9aac83d22ddbebc22fb1360d710263d349c2fdda (patch) | |
| tree | 7aa83487218bffaafa014063d98c778fc3019aa0 /src/declarative | |
| parent | 57b34cf8dbad22a1c37bf44753d314dc22c3fc70 (diff) | |
Fix typos in comments and documentation
Change-Id: Ie7c4d63d632bf32ee583ddcd807252225ddde3fd
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflickable.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativecomponent.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/util/qdeclarativeanimation.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp index 64ae2094..3042dc14 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp @@ -1331,7 +1331,7 @@ void QDeclarativeFlickable::setBoundsBehavior(BoundsBehavior b) \snippet doc/src/snippets/declarative/flickable.qml document - In some cases, the the content dimensions can be automatically set + In some cases, the content dimensions can be automatically set using the \l {Item::childrenRect.width}{childrenRect.width} and \l {Item::childrenRect.height}{childrenRect.height} properties. */ diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index f2596cc1..cbf23fa6 100644 --- a/src/declarative/qml/qdeclarativecomponent.cpp +++ b/src/declarative/qml/qdeclarativecomponent.cpp @@ -782,7 +782,7 @@ QObject *QDeclarativeComponent::create(QDeclarativeContext *context) When QDeclarativeComponent 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, QDeclarativeParserStatus::componentComplete() is called on objects. \endlist QDeclarativeComponent::beginCreate() differs from QDeclarativeComponent::create() in that it diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index a72df77a..9f0c73ac 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -791,7 +791,7 @@ void QDeclarativeScriptAction::setScript(const QDeclarativeScriptString &script) /*! \qmlproperty string 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. |