diff options
| author | Bea Lam <bea.lam@nokia.com> | 2012-08-24 13:00:52 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-28 01:51:11 +0200 |
| commit | aca4525ff56709044500ba2eaa8083ed12da9008 (patch) | |
| tree | e8c32399b30b9e56037d2068d0ab8ef37e5d7692 /src/qml/doc/src/javascript/qmlglobalobject.qdoc | |
| parent | 8b003170ec4998f10c97bba619bc993853df499a (diff) | |
Clean up structure of JavaScript related docs
The global object and list of javascript functions should be linked to
as subsections from the "JavaScript Host Environment" topic page, and
all of the subsections should be visible from the module index page.
Also move the "restrictions" docs to this topic page as it's more
relevant to this section.
Also includes some minor doc improvements.
Task-number: QTBUG-26380
Change-Id: Iba6e4e510191bf5e4603d6cbb2826ad7bcdbd10c
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'src/qml/doc/src/javascript/qmlglobalobject.qdoc')
| -rw-r--r-- | src/qml/doc/src/javascript/qmlglobalobject.qdoc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/doc/src/javascript/qmlglobalobject.qdoc b/src/qml/doc/src/javascript/qmlglobalobject.qdoc index c45b430025..8425eead30 100644 --- a/src/qml/doc/src/javascript/qmlglobalobject.qdoc +++ b/src/qml/doc/src/javascript/qmlglobalobject.qdoc @@ -30,7 +30,9 @@ \brief Description of the Qml Global Object -The QML JavaScript host environment implements the following host objects and functions: +The QML JavaScript host environment implements the following host objects and functions. +These are built in and can be used from any JavaScript code loaded in QML, without +additional imports: \list \li The \l{QmlGlobalQtObject}{Qt object}: This object is specific to QML, and provides helper methods |