diff options
| author | Sze Howe Koh <szehowe.koh@gmail.com> | 2013-04-17 23:03:16 +0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-23 18:29:25 +0200 |
| commit | 59f075df52f5e78b95b360fb0533c2249924e7a7 (patch) | |
| tree | eab4bff86cbabf6ced5beed81238c5744a53d53e /src/qml/doc/src/javascript | |
| parent | ee2a4a90cdfc024d452ca82dfb2e1d84c050595f (diff) | |
Doc: Qt Quick: Fix module name format (Pt 1/2)
Follow the conventions at
http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation
Attempt to differentiate between the whole module ("Qt Quick") and the
QML import ("QtQuick") by encoding the latter with monospace font. There
are places in the text where both representations are valid.
Change-Id: Id6e157a4191aaa4e23a9cd5c76abfe902fe43d33
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/qml/doc/src/javascript')
| -rw-r--r-- | src/qml/doc/src/javascript/dynamicobjectcreation.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/doc/src/javascript/imports.qdoc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc b/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc index 09faa61672..27fcc7b39b 100644 --- a/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc +++ b/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc @@ -66,7 +66,7 @@ can take one or two arguments: \li The first is the parent for the new object. The parent can be a graphical object (i.e. of the \l Item type) or non-graphical object (i.e. of the \l QtObject or C++ QObject type). Only graphical objects with graphical - parent objects will be rendered to the QtQuick visual canvas. If you wish + parent objects will be rendered to the \l {Qt Quick} visual canvas. If you wish to set the parent later you can safely pass \c null to this function. \li The second is optional and is a map of property-value pairs that define initial any property values for the object. Property values specified by diff --git a/src/qml/doc/src/javascript/imports.qdoc b/src/qml/doc/src/javascript/imports.qdoc index 800091689c..f4d7f7dc08 100644 --- a/src/qml/doc/src/javascript/imports.qdoc +++ b/src/qml/doc/src/javascript/imports.qdoc @@ -71,13 +71,13 @@ parameters and return values when calling such functions from QML. \section1 Imports Within JavaScript Resources -In QtQuick 2.0, support has been added to allow JavaScript resources to import +In \c {QtQuick 2.0}, support has been added to allow JavaScript resources to import other JavaScript resources and also QML type namespaces using a variation of the standard QML import syntax (where all of the previously described rules and qualifications apply). Due to the ability of a JavaScript resource to import another script or QML -module in this fashion in QtQuick 2.0, some extra semantics are defined: +module in this fashion in \c {QtQuick 2.0}, some extra semantics are defined: \list \li a script with imports will not inherit imports from the QML document which imported it (so accessing Component.errorString will fail, for example) \li a script without imports will inherit imports from the QML document which imported it (so accessing Component.errorString will succeed, for example) |