aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/doc/src/typesystem/objecttypes.qdoc
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2012-08-02 13:06:09 +1000
committerQt by Nokia <qt-info@nokia.com>2012-08-03 09:47:47 +0200
commit21f6b4d381c31bb9cdca5c28c15add250abdd5ab (patch)
tree253ef4d9d8ffae1615000e044d3f27da82147d5c /src/qml/doc/src/typesystem/objecttypes.qdoc
parent877e6c8093db2e479d9c6317479b72ae38eabdde (diff)
Fix various broken links in documentation
Change-Id: I9e2dac37d18e3ca62e4a92be25e5c2e60ffeba00 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src/qml/doc/src/typesystem/objecttypes.qdoc')
-rw-r--r--src/qml/doc/src/typesystem/objecttypes.qdoc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/doc/src/typesystem/objecttypes.qdoc b/src/qml/doc/src/typesystem/objecttypes.qdoc
index 9d8f636f16..a73d723f26 100644
--- a/src/qml/doc/src/typesystem/objecttypes.qdoc
+++ b/src/qml/doc/src/typesystem/objecttypes.qdoc
@@ -47,10 +47,10 @@ and registering the type with the QML engine, as discussed in
\l{qtqml-cppintegration-definetypes.html}{Defining QML Types from C++}.
-\section1 Creating Object Types from QML
+\section1 Defining Object Types from QML
-\section2 Creating Object Types from QML Documents
+\section2 Defining Object Types through QML Documents
Plugin writers and application developers may provide types defined as QML
documents. A QML document, when visible to the QML import system, defines a
@@ -70,7 +70,7 @@ See \l {Defining Object Types through QML Documents} for more information.
-\section2 Creating Anonymous Types with Component
+\section2 Defining Anonymous Types with Component
Another method of creating object types from within QML is to use the \l Component type.
This allows a type to be defined inline within a QML document, instead of using a separate
@@ -114,9 +114,9 @@ different component scopes.
See \l{qtqml-documents-scope.html}{Scope and Naming Resolution} for more details.
-\section1 Creating Object Types from C++
+\section1 Defining Object Types from C++
-Plugin writers and application developers may register types defined in C++
+C++ plugin writers and application developers may register types defined in C++
through API provided by the Qt QML module. There are various registration
functions which each allow different use-cases to be fulfilled.