diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-11 09:27:02 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-11 09:27:02 +0100 |
| commit | 720431716a8af66d1be73a1c9462ef12af831c90 (patch) | |
| tree | c54a9e61a4507247de404046338d38ca2828540e /src/declarative/qml/qdeclarativecomponent.cpp | |
| parent | 6766fcf138b7cec101cd0c7d3d9a7ac42f1bfe3a (diff) | |
| parent | 9aac83d22ddbebc22fb1360d710263d349c2fdda (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I09ce9ad6e50bdb6034717d45ad73b4d21474a6e2
Diffstat (limited to 'src/declarative/qml/qdeclarativecomponent.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativecomponent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index aebf912b..41b56a6a 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 |