diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-05-11 22:45:12 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-05-11 22:45:12 (GMT) |
| commit | 0f9f07c52310c33433dcdf5db3e9d02c695b85af (patch) | |
| tree | 80b8a6b2521771eccd7864e850edfa5bb62415e2 | |
| parent | 1a60fdf2a97e922e8d4dcb0158649e5b285ce066 (diff) | |
| download | Qt-0f9f07c52310c33433dcdf5db3e9d02c695b85af.zip Qt-0f9f07c52310c33433dcdf5db3e9d02c695b85af.tar.gz Qt-0f9f07c52310c33433dcdf5db3e9d02c695b85af.tar.bz2 | |
Document Component::createObject() parent argument.
Task-number: QTBUG-10617
| -rw-r--r-- | src/declarative/QmlChanges.txt | 4 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativecomponent.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt index dfc4244..9f618d8 100644 --- a/src/declarative/QmlChanges.txt +++ b/src/declarative/QmlChanges.txt @@ -7,7 +7,7 @@ Component: isReady, isLoading, isError and isNull properties removed, use QList<QObject*> models no longer provide properties in model object. The properties are now updated when the object changes. An object's property "foo" may now be accessed as "foo", modelData.foo" or model.modelData.foo" - +component.createObject has gained a mandatory "parent" argument C++ API ------- @@ -15,7 +15,7 @@ QDeclarativeExpression::value() has been renamed to QDeclarativeExpression::evaluate() ============================================================================= -The changes below are pre Qt 4.7.0 beta +The changes below are pre Qt 4.7.0 beta 1 TextEdit: wrap property is replaced by wrapMode enumeration. Text: wrap property is replaced by wrapMode enumeration. diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index afdaee8..e757675 100644 --- a/src/declarative/qml/qdeclarativecomponent.cpp +++ b/src/declarative/qml/qdeclarativecomponent.cpp @@ -545,7 +545,7 @@ QDeclarativeComponent::QDeclarativeComponent(QDeclarativeComponentPrivate &dd, Q } /*! - \qmlmethod object Component::createObject() + \qmlmethod object Component::createObject(parent) Returns an object instance from this component, or null if object creation fails. The object will be created in the same context as the one in which the component |