summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-11-29 23:54:55 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-11-29 23:54:55 (GMT)
commite30409e0d93755bea4d18bcff4b9b86602c6dd52 (patch)
tree00a02590e4c2ed7cfe478c294935b06c11aa4829 /doc/src
parent15145a3b6d675c268b6262d11d390eaf9fc25fee (diff)
parentdc59b792119241988cdfe9f31d3aea55dcd5e8fe (diff)
downloadQt-e30409e0d93755bea4d18bcff4b9b86602c6dd52.zip
Qt-e30409e0d93755bea4d18bcff4b9b86602c6dd52.tar.gz
Qt-e30409e0d93755bea4d18bcff4b9b86602c6dd52.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.qdoc10
1 files changed, 1 insertions, 9 deletions
diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc
index 3eadec2..2bed1c1 100644
--- a/doc/src/declarative/globalobject.qdoc
+++ b/doc/src/declarative/globalobject.qdoc
@@ -42,17 +42,9 @@
/*!
\page qmlglobalobject.html
\title QML Global Object
-Contains all the properties of the ECMAScript global object, plus:
-\list
-\o Qt
-\o createQmlObject
-\o createComponent
-\o XMLHttpRequest
-\o openDatabase
-\endlist
+Contains all the properties of the ECMAScript global object, plus:
-Contents:
\tableofcontents
\section1 Qt Object