diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-05-26 22:59:51 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-05-26 22:59:51 (GMT) |
| commit | a9462494b6eb5e07f8320cf7d99bdad9c9917434 (patch) | |
| tree | 09ebfbdc94e04278414608ef09125b0ac8fc6646 /doc/src/declarative/globalobject.qdoc | |
| parent | a5391f187b91aaf9d6932f2ad1e81701e6cd0352 (diff) | |
| parent | 124efaa694316a4e02684fde151395d8e1d28b7a (diff) | |
| download | Qt-a9462494b6eb5e07f8320cf7d99bdad9c9917434.zip Qt-a9462494b6eb5e07f8320cf7d99bdad9c9917434.tar.gz Qt-a9462494b6eb5e07f8320cf7d99bdad9c9917434.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'doc/src/declarative/globalobject.qdoc')
| -rw-r--r-- | doc/src/declarative/globalobject.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc index fcd227d..7d4f9b9 100644 --- a/doc/src/declarative/globalobject.qdoc +++ b/doc/src/declarative/globalobject.qdoc @@ -49,7 +49,7 @@ Contains all the properties of the JavaScript global object, plus: \section1 Qt Object -The \l{qt-qml.html}{Qt object} provides useful enums and functions from Qt, for use in all QML +The \l{qml-qt.html}{Qt object} provides useful enums and functions from Qt, for use in all QML files. \section1 XMLHttpRequest |