diff options
| author | Bea Lam <bea.lam@nokia.com> | 2012-08-27 13:13:36 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-28 01:51:14 +0200 |
| commit | c2f2ae8ce90e621cc3835428c40c116fbdc593e6 (patch) | |
| tree | 2c165bb71cf66271ed31b940adb948a181ce0127 /src/qml | |
| parent | aca4525ff56709044500ba2eaa8083ed12da9008 (diff) | |
Improve docs related to visual parent concept
Change-Id: I73cc63c8a55cf949b94a2fa502cb331fb8adbda3
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/doc/src/syntax/basics.qdoc | 1 | ||||
| -rw-r--r-- | src/qml/doc/src/syntax/objectattributes.qdoc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/doc/src/syntax/basics.qdoc b/src/qml/doc/src/syntax/basics.qdoc index 4c3e475f36..abfa6d5c0e 100644 --- a/src/qml/doc/src/syntax/basics.qdoc +++ b/src/qml/doc/src/syntax/basics.qdoc @@ -69,6 +69,7 @@ Please see the \l{qtqml-syntax-imports.html}{QML Syntax - Import Statements} documentation for in-depth information about QML imports. +\keyword qml-object-declarations \section1 Object Declarations Syntactically, a block of QML code defines a tree of QML objects to be created. Objects are diff --git a/src/qml/doc/src/syntax/objectattributes.qdoc b/src/qml/doc/src/syntax/objectattributes.qdoc index 314bd4512b..7675a027e4 100644 --- a/src/qml/doc/src/syntax/objectattributes.qdoc +++ b/src/qml/doc/src/syntax/objectattributes.qdoc @@ -522,7 +522,7 @@ property and refer to the actual defined property rather than the alias. An object definition can have a single \e default property. A default property is the property to which a value is assigned if an object is declared within -another object's definition without attaching it as a value to a particular +another object's definition without declaring it as a value for a particular property. Declaring a property with the optional \c default keyword marks it as the |