diff options
author | Chris Adams <christopher.adams@nokia.com> | 2012-05-28 17:12:56 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-21 09:58:56 +0200 |
commit | 5e33b0f580d2b20f1a2989bf2ee8dde4525a2e39 (patch) | |
tree | 780d25ce7d8955e56ea985a35dd84609df12fbf0 /src/qml/qml/qqmlcomponent.cpp | |
parent | 03342a435a88656d64d1445991a4421d244fcb45 (diff) |
Create new documentation structure
The documentation currently has no clear separation between Qt QML
and Qt Quick. With recent commits like:
6c8378eaf1edbbefe6aaa3672b0127816a004fd7
and
ab1e510121c8a679fdaca12ccd30e0f7ac12a26b
the separation between the language definition and implementation,
provided by Qt QML, and the standard library for the QML language,
provided by Qt Quick, is clear.
This commit creates a new documentation structure that is more
navigable and separates concepts into logical categories, with
clear separation between QtQML and QtQuick. It also provides a more
generic QML Application Developer Resources page which contains links
to information for QML application developers.
Change-Id: Ia807ccfbfd24ffa0e1c7f0a51ed9d2ed3aa6a733
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlcomponent.cpp')
-rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index ecadc00396..42dbb2baa4 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -118,7 +118,6 @@ static inline QString buildTypeNameForDebug(const QMetaObject *metaObject) \brief The QQmlComponent class encapsulates a QML component definition Components are reusable, encapsulated QML elements with well-defined interfaces. - They are often defined in \l {qdeclarativedocuments.html}{Component Files}. A QQmlComponent instance can be created from a QML file. For example, if there is a \c main.qml file like this: @@ -183,8 +182,6 @@ static inline QString buildTypeNameForDebug(const QMetaObject *metaObject) \endcode Note that the QtQuick 1 version is named QDeclarativeComponent. - - \sa {Using QML Bindings in C++ Applications}, {Integrating QML Code with Existing Qt UI Code} */ /*! @@ -196,7 +193,7 @@ static inline QString buildTypeNameForDebug(const QMetaObject *metaObject) Components are reusable, encapsulated QML elements with well-defined interfaces. - Components are often defined by \l {qdeclarativedocuments.html}{component files} - + Components are often defined by \l {{QML Documents}}{component files} - that is, \c .qml files. The \e Component element essentially allows QML components to be defined inline, within a \l {QML Document}{QML document}, rather than as a separate QML file. This may be useful for reusing a small component within a QML file, or for defining @@ -1082,7 +1079,7 @@ static void QQmlComponent_setQmlParent(QObject *me, QObject *parent) \endjs Dynamically created instances can be deleted with the \c destroy() method. - See \l {Dynamic Object Management in QML} for more information. + See \l {Dynamic QML Object Creation from JavaScript} for more information. \sa incubateObject() */ @@ -1197,7 +1194,7 @@ void QQmlComponent::createObject(QQmlV8Function *args) \endjs Dynamically created instances can be deleted with the \c destroy() method. - See \l {Dynamic Object Management in QML} for more information. + See \l {Dynamic QML Object Creation from JavaScript} for more information. \sa createObject() */ |