diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-02-16 14:43:03 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 04:51:31 +0100 |
| commit | b855240b782395f94315f43ea3e7e182299fac48 (patch) | |
| tree | bc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /doc/src/qml/qmldocument.qdoc | |
| parent | 6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff) | |
Rename QDeclarative symbols to QQuick and QQml
Symbols beginning with QDeclarative are already exported
by the quick1 module.
Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.
Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'doc/src/qml/qmldocument.qdoc')
| -rw-r--r-- | doc/src/qml/qmldocument.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/qml/qmldocument.qdoc b/doc/src/qml/qmldocument.qdoc index fedeba35e1..426f135a45 100644 --- a/doc/src/qml/qmldocument.qdoc +++ b/doc/src/qml/qmldocument.qdoc @@ -36,7 +36,7 @@ from text data. Here is a simple QML document: -\snippet doc/src/snippets/declarative/qml-documents/non-trivial.qml document +\snippet doc/src/snippets/qml/qml-documents/non-trivial.qml document QML documents are always encoded in UTF-8 format. @@ -79,7 +79,7 @@ text property: \o application.qml \row -\o \snippet doc/src/snippets/declarative/qml-documents/qmldocuments.qml document +\o \snippet doc/src/snippets/qml/qml-documents/qmldocuments.qml document \o \qml import QtQuick 2.0 @@ -138,14 +138,14 @@ These final two examples perform identically to the original document. \table \row \o -\snippet doc/src/snippets/declarative/qml-documents/inline-component.qml document +\snippet doc/src/snippets/qml/qml-documents/inline-component.qml document \o -\snippet doc/src/snippets/declarative/qml-documents/inline-text-component.qml document +\snippet doc/src/snippets/qml/qml-documents/inline-text-component.qml document \endtable For information about components, the \l{QML Components} article details the creation of components and how to load them in other components. -\sa QDeclarativeComponent +\sa QQmlComponent */ |