summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2009-10-28 05:05:49 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2009-10-28 05:05:49 (GMT)
commit1545a7f0e67cc125a116f0d72b81cb325a675381 (patch)
tree486820827b02ede1eab5f713baa38e9e7098cb7b /doc
parentf6b063eeef71b4cb7c1cff090166201f794c9679 (diff)
parent1f8a4748e860d259d525e47426fd3a1072d9fb5c (diff)
downloadQt-1545a7f0e67cc125a116f0d72b81cb325a675381.zip
Qt-1545a7f0e67cc125a116f0d72b81cb325a675381.tar.gz
Qt-1545a7f0e67cc125a116f0d72b81cb325a675381.tar.bz2
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc')
-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