summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-05-06 06:12:29 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-05-06 06:12:29 (GMT)
commiteddff2b6638f8dd33c272ca9368d67960afe86f7 (patch)
treeb982e34c29bc65092cd11125c26d2a2d5ce95f60
parent95db707e2fe96eb7b6e5edcbd2850149b16e23b2 (diff)
parentb640dffcfb6fd2c493750ae29032a8beb47152b8 (diff)
downloadQt-eddff2b6638f8dd33c272ca9368d67960afe86f7.zip
Qt-eddff2b6638f8dd33c272ca9368d67960afe86f7.tar.gz
Qt-eddff2b6638f8dd33c272ca9368d67960afe86f7.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
-rw-r--r--doc/src/qmlviewer.qdoc11
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/src/qmlviewer.qdoc b/doc/src/qmlviewer.qdoc
index e8fdec4..e9f8029 100644
--- a/doc/src/qmlviewer.qdoc
+++ b/doc/src/qmlviewer.qdoc
@@ -68,11 +68,12 @@
that is a qreal from 0 to 86400 representing the number of seconds since
midnight, dummy data for this could be provided by \c dummydata/clock.qml:
\code
- <Object>
- <properties>
- <Property name="time" value="12345"/>
- </properties>
- </Object>
+ Object {
+ properties: Property {
+ name: "time"
+ value: 12345
+ }
+ }
\endcode
Any QML can be used in the dummy data files. You could even animate the
fictional data!