diff options
| author | Chris Adams <christopher.adams@nokia.com> | 2012-08-06 12:15:32 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-08 13:50:40 +0200 |
| commit | 4a8a8953f70197a7ab7a62fcd01b1bc08051689e (patch) | |
| tree | 037e78c35f675e8d5b7bc00f26d8d984387eda86 /src/qml/doc/src/javascript/topic.qdoc | |
| parent | 3b0aa0d8048ffa0bb75bb7b29c903e4499c796a8 (diff) | |
Update imports and module documentation
Recently, the qmldir syntax was modified to allow a module identifier
directive to be specified. This allows us to guarantee that types
provided in that namespace are not overridden by other modules.
Given this fundamental change, the documentation needed to be updated
to reflect the new terminology surrounding imports:
- modules
- identified vs legacy
- directories
- local and remote directory imports
- JavaScript resources
- scripts which can be imported directly
Change-Id: I5a3d38de93d0186e79b87f2b3050f2b802088348
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'src/qml/doc/src/javascript/topic.qdoc')
| -rw-r--r-- | src/qml/doc/src/javascript/topic.qdoc | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/qml/doc/src/javascript/topic.qdoc b/src/qml/doc/src/javascript/topic.qdoc index 19019f0817..2c3006ef60 100644 --- a/src/qml/doc/src/javascript/topic.qdoc +++ b/src/qml/doc/src/javascript/topic.qdoc @@ -51,13 +51,26 @@ See the documentation page titled \l{qtqml-javascript-expressions.html}{JavaScript Expressions in QML Documents} for more information about using JavaScript expressions in QML. +\section1 JavaScript Resources + +Application logic defined in JavaScript functions may be separated into +separate JavaScript files known as JavaScript resources. There are several +different kinds of JavaScript resources, with different semantics. + +See the documentation page titled \l{qtqml-javascript-resources.html} +{Defining JavaScript Resources In QML} for more information about defining JavaScript +resources for QML. + \section1 JavaScript Imports -A QML document may import JavaScript files. This allows an application -developer to provide application logic in modular, self-contained files. +A QML document may import JavaScript resources, and JavaScript resources may +import other JavaScript resources as well as QML modules. 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} -for more information on how to import JavaScript files and how to use the +\l{qtqml-javascript-imports.html}{Importing JavaScript Resources} +for more information on how to import JavaScript resources and how to use the functionality they provide. \section1 JavaScript Host Environment |