summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-10-28 05:22:35 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-10-28 05:22:35 (GMT)
commit5c44fa2e28c4da946b59841ec2480c5d38969784 (patch)
tree73fa88fc5dd096346315ccd87115849923ab3d76 /doc/src
parent57d2291b2e0533d23bd52e9814faf6a5727a4e96 (diff)
parent1545a7f0e67cc125a116f0d72b81cb325a675381 (diff)
downloadQt-5c44fa2e28c4da946b59841ec2480c5d38969784.zip
Qt-5c44fa2e28c4da946b59841ec2480c5d38969784.tar.gz
Qt-5c44fa2e28c4da946b59841ec2480c5d38969784.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/declarative/globalobject.qdoc26
1 files changed, 26 insertions, 0 deletions
diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc
index 2328c8a..afbe3db 100644
--- a/doc/src/declarative/globalobject.qdoc
+++ b/doc/src/declarative/globalobject.qdoc
@@ -56,6 +56,32 @@ Contains all the properties of the ECMAScript global object, plus:
\section1 Qt Object
+The Qt object contains functions for
+
+creating types:
+\list
+\o hsla
+\o rgba
+\o rect
+\o point
+\o size
+\o vector3d
+\endlist
+
+manipulating color:
+\list
+\o lighter
+\o darker
+\o tint
+\endlist
+
+and playing sound:
+\list
+\o playSound
+\endlist
+
+It also contains enum values used by some items.
+
\section1 Asynchronous JavaScript and XML
\section1 Offline Storage API