diff options
author | Yann Bodson <yann.bodson@nokia.com> | 2012-07-18 14:39:20 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-20 03:46:56 +0200 |
commit | 6742d20581a7b05461b2c1662b39fcc68e84b4e2 (patch) | |
tree | d5f6a65d3cc8f2fd29ac14497430fcee17f02bcf /src/qml/doc/src/javascript | |
parent | b8c80243abc4f96e31243bf04dc29318fae61864 (diff) |
Make title capitalization more consistent in QML documentation.
Change-Id: Iec8168135676e0e9e130bd2245ef33fd780829d5
Reviewed-by: Alan Alpert <alan.alpert@nokia.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/expressions.qdoc | 6 | ||||
-rw-r--r-- | src/qml/doc/src/javascript/imports.qdoc | 6 | ||||
-rw-r--r-- | src/qml/doc/src/javascript/topic.qdoc | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc b/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc index bd8e50cd53..78ce09d0ad 100644 --- a/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc +++ b/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc @@ -27,7 +27,7 @@ /*! \page qtqml-javascript-dynamicobjectcreation.html -\title Dynamic QML object creation from JavaScript +\title Dynamic QML Object Creation from JavaScript \brief instantiating and managing QML objects from JavaScript QML supports the dynamic creation of objects from within JavaScript. This is diff --git a/src/qml/doc/src/javascript/expressions.qdoc b/src/qml/doc/src/javascript/expressions.qdoc index 33007943f0..130be84b0b 100644 --- a/src/qml/doc/src/javascript/expressions.qdoc +++ b/src/qml/doc/src/javascript/expressions.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! \page qtqml-javascript-expressions.html -\title JavaScript Expressions In QML Documents +\title JavaScript Expressions in QML Documents \brief Description of where JavaScript expressions are valid in QML documents @@ -71,7 +71,7 @@ logic. There are four ways that JavaScript can be used in a QML document: \li \l{QML Object Attributes#custom-methods}{custom methods} can be defined in QML files as JavaScript functions \li JavaScript files providing functions and variables can be - \l{Importing JavaScript Files In QML Documents}{imported} in a QML + \l{Importing JavaScript Files in QML Documents}{imported} in a QML document \endlist @@ -507,7 +507,7 @@ required, during evaluation of a JavaScript expression. \snippet qml/integrating-javascript/scarceresources/avatarExample.cpp 4 -\section2 Example Five: Explicit Destruction And JavaScript References +\section2 Example Five: Explicit Destruction and JavaScript References One thing to be aware of when using "var" type properties is that they hold references to JavaScript objects. As such, if multiple references diff --git a/src/qml/doc/src/javascript/imports.qdoc b/src/qml/doc/src/javascript/imports.qdoc index 9e71368f81..df8141dec5 100644 --- a/src/qml/doc/src/javascript/imports.qdoc +++ b/src/qml/doc/src/javascript/imports.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! \page qtqml-javascript-imports.html -\title Importing JavaScript Files In QML Documents +\title Importing JavaScript Files in QML Documents \brief Description of how to import and use JavaScript files in QML documents Both relative and absolute JavaScript URLs can be imported in QML documents. @@ -47,7 +47,7 @@ The functions defined in an imported JavaScript file are available to objects defined in the importing QML document, via the \c{"Qualifier.functionName()"} syntax. -\section1 Importing One JavaScript File From Another +\section1 Importing a JavaScript File from Another In QtQuick 2.0, support has been added to allow JavaScript files to import other JavaScript files and also QML type namespaces using a variation of the @@ -155,7 +155,7 @@ As they are shared, .pragma library files cannot access QML component instance objects or properties directly, although QML values can be passed as function parameters. -\section1 Including One JavaScript File From Another +\section1 Including a JavaScript File from Another When a JavaScript file is imported, it must be imported with a qualifier. The functions in that file are then accessible from the importing script via the diff --git a/src/qml/doc/src/javascript/topic.qdoc b/src/qml/doc/src/javascript/topic.qdoc index 015a769af4..c7d7d2b9ff 100644 --- a/src/qml/doc/src/javascript/topic.qdoc +++ b/src/qml/doc/src/javascript/topic.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! \page qtqml-javascript-topic.html -\title Integrating QML And JavaScript +\title Integrating QML and JavaScript \brief Description of how to use JavaScript in QML applications The QML language uses a JSON-like syntax and allows various expressions and @@ -48,7 +48,7 @@ can include properties from other objects. These are JavaScript expressions. See the documentation page titled -\l{qtqml-javascript-expressions.html}{JavaScript Expressions In QML Documents} +\l{qtqml-javascript-expressions.html}{JavaScript Expressions in QML Documents} for more information about using JavaScript expressions in QML. \section1 JavaScript Imports @@ -56,7 +56,7 @@ for more information about using JavaScript expressions in QML. A QML document may import JavaScript files. This allows an application developer to provide application logic in modular, self-contained files. See the documentation page titled -\l{qtqml-javascript-imports.html}{Importing JavaScript Files In QML Documents} +\l{qtqml-javascript-imports.html}{Importing JavaScript Files in QML Documents} for more information on how to import JavaScript files and how to use the functionality they provide. |