diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2011-04-14 04:47:16 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2011-04-14 04:47:16 (GMT) |
| commit | cc3bcc003048760a501debe49b6fcebffaac3cef (patch) | |
| tree | 5d8d8e5ea0cd1c9dffc6abd3e6e40058536236c8 /src/declarative/qml/qdeclarativecomponent.cpp | |
| parent | a5d5971586d0a12e55374dae30e17454bca12600 (diff) | |
| parent | 662174b78b7e08c759d0086e215e81e9e0eaf0c5 (diff) | |
| download | Qt-cc3bcc003048760a501debe49b6fcebffaac3cef.zip Qt-cc3bcc003048760a501debe49b6fcebffaac3cef.tar.gz Qt-cc3bcc003048760a501debe49b6fcebffaac3cef.tar.bz2 | |
Merge branch 'master' of ../qt-qml-staging
Diffstat (limited to 'src/declarative/qml/qdeclarativecomponent.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativecomponent.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index fc393d1..276f790 100644 --- a/src/declarative/qml/qdeclarativecomponent.cpp +++ b/src/declarative/qml/qdeclarativecomponent.cpp @@ -137,7 +137,7 @@ class QByteArray; } \endcode - \sa {Using QML in C++ Applications}, {Integrating QML with existing Qt UI code} + \sa {Using QML Bindings in C++ Applications}, {Integrating QML Code with Existing Qt UI Code} */ /*! @@ -643,11 +643,11 @@ QDeclarativeComponent::QDeclarativeComponent(QDeclarativeComponentPrivate &dd, Q The \a properties argument is specified as a map of property-value items. For example, the code below creates an object with initial \c x and \c y values of 100 and 200, respectively: - \qml + \js var component = Qt.createComponent("Button.qml"); if (component.status == Component.Ready) component.createObject(parent, {"x": 100, "y": 100}); - \endqml + \endjs Dynamically created instances can be deleted with the \c destroy() method. See \l {Dynamic Object Management in QML} for more information. |