diff options
author | Chris Adams <christopher.adams@nokia.com> | 2012-08-20 17:13:48 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-27 08:13:24 +0200 |
commit | e98a8b69cc0d900581942872b76ae81dc24931ee (patch) | |
tree | 57a7fbae87a5936336e0d0a345a16adc4894de8d /src/qml/doc/src/typesystem | |
parent | 965588737321d10fd1fbca3f89b4c6257b7b5d47 (diff) |
Move the Property Modifier Type documentation
Property Modifier Types are just another sort of QML object type, and
don't deserve explicit top-level documentation. This commit moves the
docs into the object types documentation, and adds documentation to the
syntax page about the "<PropertyModifierObject> on <propertyName>"
syntax.
Change-Id: Ia9b707739b562d2c8b75fa99b88795ba4d415cf7
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/qml/doc/src/typesystem')
-rw-r--r-- | src/qml/doc/src/typesystem/objecttypes.qdoc | 17 | ||||
-rw-r--r-- | src/qml/doc/src/typesystem/topic.qdoc | 50 |
2 files changed, 5 insertions, 62 deletions
diff --git a/src/qml/doc/src/typesystem/objecttypes.qdoc b/src/qml/doc/src/typesystem/objecttypes.qdoc index faa76b4ce7..3d807fc938 100644 --- a/src/qml/doc/src/typesystem/objecttypes.qdoc +++ b/src/qml/doc/src/typesystem/objecttypes.qdoc @@ -119,21 +119,14 @@ See \l{qtqml-documents-scope.html}{Scope and Naming Resolution} for more details 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. - -\list -\li qmlRegisterType -\li qmlRegisterUncreatableType -\li qmlRegisterExtendedType -\li qmlRegisterInterface -\li qmlRegisterCustomType -\li qmlRegisterSingletonType -\endlist - -For more information on this topic, see the documentation regarding +For more information about those registration functions, and the specifics of +exposing custom C++ types to QML, see the documentation regarding \l{qtqml-cppintegration-definetypes.html}{Defining QML Types from C++}. The QML type-system relies on imports, plugins and extensions being installed into a known import path. Plugins may be provided by third-party developers -and reused by client application developers. +and reused by client application developers. Please see the documentation +about \l{qtqml-modules-topic.html}{QML modules} for more information about +how to create and deploy a QML extension module. */ diff --git a/src/qml/doc/src/typesystem/topic.qdoc b/src/qml/doc/src/typesystem/topic.qdoc index 3fe17943bb..098c2ed630 100644 --- a/src/qml/doc/src/typesystem/topic.qdoc +++ b/src/qml/doc/src/typesystem/topic.qdoc @@ -95,54 +95,4 @@ re-used in other QML documents. See the documentation about \l{qtqml-typesystem-objecttypes.html}{object types in the QML type system} for in-depth information about object types. -\section1 Property Modifier Types - -A property modifier type is a special kind of QML object type. A property -modifier type instance affects a property (of a QML object instance) which it -is applied to. There are two different kinds of property modifier types: -\list -\li property value write interceptors -\li property value sources -\endlist - -A property value write interceptor can be used to filter or modify values as -they are written to properties. Currently, the only supported property -value write interceptor is the \l Behavior type provided by the \c QtQuick -import. - -A property value source can be used to automatically update the value of a -property over time. Clients can define their own property value source types. -The various \l{qtquick-statesanimations-animations.html}{property animation} -types provided by the \c QtQuick import are examples of property value -sources. - -Property modifier type instances can be created and applied to a property of -a QML object through the "<ModifierType> on <propertyName>" syntax, as the -following example shows: - -\qml -import QtQuick 2.0 - -Item { - width: 400 - height: 50 - - Rectangle { - width: 50 - height: 50 - color: "red" - - NumberAnimation on x { - from: 0 - to: 350 - loops: Animation.Infinite - duration: 2000 - } - } -} -\endqml - -See the documentation on \l QQmlPropertyValueSource for information about how -to define your own property value source types. - */ |