summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2010-03-26 08:37:14 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2010-03-26 08:37:14 (GMT)
commit8217da65cbe44261a83418017be311bb1a62725d (patch)
tree7a9d06f8a010223a71605c1dd6475de905d24da5
parent43381162eac93f0fbe10e06944c59158dccb3d8c (diff)
downloadQt-8217da65cbe44261a83418017be311bb1a62725d.zip
Qt-8217da65cbe44261a83418017be311bb1a62725d.tar.gz
Qt-8217da65cbe44261a83418017be311bb1a62725d.tar.bz2
Doc Augmentation
Task-number: QTBUG-9396
-rw-r--r--doc/src/declarative/extending.qdoc13
-rw-r--r--src/declarative/graphicsitems/qdeclarativepositioners.cpp4
2 files changed, 16 insertions, 1 deletions
diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc
index 8c096da..3dce8c3 100644
--- a/doc/src/declarative/extending.qdoc
+++ b/doc/src/declarative/extending.qdoc
@@ -693,6 +693,19 @@ it in two steps, like this:
myProperty: 10
\endcode
+If a default value is not supplied or set later in the file, each type has a
+default value for when none is explictly set. Below are the default values
+of some of the types. For the remaining types the default values are undefined.
+
+\table
+\header \o QML Type \o Default Value
+\row \o bool \o false
+\row \o int \o 0
+\row \o double, real \o 0.0
+\row \o string, url \o "" (an empty string)
+\row \o color \o #000000 (black)
+\endtable
+
If specified, the optional "default" attribute marks the new property as the
types default property, overriding any existing default property. Using the
default attribute twice in the same type block is an error.
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
index 7a0d33a..5e91224 100644
--- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
@@ -602,7 +602,9 @@ Grid {
\qmlproperty Transition Grid::add
This property holds the transition to apply when adding an item to the positioner.
The transition is only applied to the added item(s).
- Positioner transitions will only affect the position (x,y) of items.
+ Positioner transitions will only affect the position (x,y) of items,
+ as that is all the positioners affect. To animate other property change
+ you will have to do so based on how you have changed those properties.
Added can mean that either the object has been created or
reparented, and thus is now a child or the positioner, or that the