diff options
author | Glenn Watson <glenn.watson@nokia.com> | 2012-07-24 11:41:50 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-08 07:55:19 +0200 |
commit | 6ebf215fdaf2d757ab90ae4d46c4b938e978e2dc (patch) | |
tree | 515da352f1cc4d5567b6d93f0b19952b2e27d705 /src/qml/doc/src/syntax | |
parent | 92562eacbc3c614a83a734f1108ed7df02415eae (diff) |
Add type name to singleton (module api) implementations.
This change renames the previous module api implementation
to singleton types.
When a singleton type is registered, a type name must be provided
that is used when accessing the API from QML. This makes the
implementation more consistent with the rest of QML.
Task-number: QTBUG-26549
Change-Id: Iab0bb1ccf516bd3ae20aee562a64d22976e0aecd
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'src/qml/doc/src/syntax')
-rw-r--r-- | src/qml/doc/src/syntax/basics.qdoc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/qml/doc/src/syntax/basics.qdoc b/src/qml/doc/src/syntax/basics.qdoc index 786d208653..4c3e475f36 100644 --- a/src/qml/doc/src/syntax/basics.qdoc +++ b/src/qml/doc/src/syntax/basics.qdoc @@ -43,18 +43,16 @@ An import can be any one of: \list \li a versioned namespace into which types have been registered (e.g., by a plugin) -\li a versioned namespace which provides a module API \li a relative directory which contains type-definitions as QML documents \li a JavaScript file \endlist -Module API imports and JavaScript file imports must be qualified when -imported, so that the properties and methods they provide can be accessed. +JavaScript file imports must be qualified when imported, so that the properties and methods they provide can be accessed. The generic form of the various imports are as follows: \list \li \tt{import Namespace VersionMajor.VersionMinor} -\li \tt{import Namespace VersionMajor.VersionMinor as ModuleApiIdentifier} +\li \tt{import Namespace VersionMajor.VersionMinor as SingletonTypeIdentifier} \li \tt{import "directory"} \li \tt{import "file.js" as ScriptIdentifier} \endlist |