diff options
author | Jerome Pasion <jerome.pasion@digia.com> | 2013-03-25 12:37:22 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-26 22:45:31 +0100 |
commit | 363385a549f33b2b0a34ac9cc8149376f456655c (patch) | |
tree | ff7da1b3cbae0f42666a3cc30d26e32781f6dbbd /src/qml/doc/src/cppintegration/definetypes.qdoc | |
parent | aaa8fd67a499b75f8ec3dc4eea2b53bbdeff11d2 (diff) |
Doc: Fixed some uses of terminolgies in qdoc files.
-"element" -> "type" or "object" (not in all cases where this change applies)
-some instances of QtQuick. It should be "Qt Quick".
-only in qdoc files. Examples and source code changes will be done later.
Task-number: QTBUG-30180
Change-Id: Ie587461a138e97606f761ad1e90909c91b479303
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/qml/doc/src/cppintegration/definetypes.qdoc')
-rw-r--r-- | src/qml/doc/src/cppintegration/definetypes.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/doc/src/cppintegration/definetypes.qdoc b/src/qml/doc/src/cppintegration/definetypes.qdoc index 84eb4bb2cd..be5f26a865 100644 --- a/src/qml/doc/src/cppintegration/definetypes.qdoc +++ b/src/qml/doc/src/cppintegration/definetypes.qdoc @@ -168,7 +168,7 @@ are constructed and owned by the QQmlEngine, and will be destroyed when the engine is destroyed. A QObject singleton type can be interacted with in a manner simlar to any -other QObject or instantiated element, except that only one (engine constructed +other QObject or instantiated type, except that only one (engine constructed and owned) instance will exist, and it must be referenced by type name rather than id. Q_PROPERTYs of QObject singleton types may be bound to, and Q_INVOKABLE functions of QObject module APIs may be used in signal handler expressions. @@ -230,7 +230,7 @@ version of their type definition, \c root.x now resolves to a different value because \c root is also the \c id of the top level component. The author could specify that the new \c root property is available from a specific minor version. This permits new properties and features to be added to existing -elements without breaking existing programs. +types without breaking existing programs. The REVISION tag is used to mark the \c root property as added in revision 1 of the type. Methods such as Q_INVOKABLE's, signals and slots can also be @@ -263,7 +263,7 @@ qmlRegisterType<CppType,1>("MyTypes", 1, 1, "CppType") \c root is only available when \c MyTypes version 1.1 is imported. -For the same reason, new elements introduced in later versions should use +For the same reason, new types introduced in later versions should use the minor version argument of qmlRegisterType. This feature of the language allows for behavioural changes to be made |