diff options
author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-10-03 10:57:39 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-04 08:32:33 +0200 |
commit | eec55d54c99b28953476e452281a8c58bfc4495b (patch) | |
tree | 14fa45bf859fc182729504a6338d17962a937bda /doc/src/declarative/modules.qdoc | |
parent | 1780033cb259bbb166fe9b4b14c92829a8e1800e (diff) |
Doc: Converting the overviews' \e commands to \i commands.
\e commands are deprecated and are only supported through an alias.
We should use the official command and not the deprecated command.
Change-Id: Icf88b9cda673f436dd855f22960112d0a37c74eb
Reviewed-on: http://codereview.qt-project.org/5918
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'doc/src/declarative/modules.qdoc')
-rw-r--r-- | doc/src/declarative/modules.qdoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc index 259c77ff3c..d37dc9d215 100644 --- a/doc/src/declarative/modules.qdoc +++ b/doc/src/declarative/modules.qdoc @@ -57,7 +57,7 @@ This imports version 1.0 of the "QtQuick" module into the global namespace. (The library itself must be imported to use any of the \l {QML Elements}, as they are not included in the global namespace by default.) -The \c Qt module is an \e installed module; it is found in the +The \c Qt module is an \i installed module; it is found in the \l{#import-path}{import path}. There are two types of QML modules: located modules (defined by a URL) and installed modules (defined by a URI). @@ -268,7 +268,7 @@ a module that is imported as a network resource. By default, when a module is imported, its contents are imported into the global namespace. You may choose to import the module into another namespace, either to allow identically-named types to be referenced, or purely for readability. -To import a module into a specific namespace, use the \e as keyword: +To import a module into a specific namespace, use the \i as keyword: \snippet doc/src/snippets/declarative/imports/named-imports.qml imports @@ -327,7 +327,7 @@ may be marked with the \c internal keyword: \bold {internal <TypeName> <File>}. The same type can be provided by different files in different versions, in which case later versions (e.g. 1.2) must precede earlier versions (e.g. 1.0), -since the \e first name-version match is used and a request for a version of a type +since the \i first name-version match is used and a request for a version of a type can be fulfilled by one defined in an earlier version of the module. If a user attempts to import a version earlier than the earliest provided or later than the latest provided, the import produces a runtime error, but if the user imports a version within the range of versions provided, @@ -338,7 +338,7 @@ If multiple are provided, only the first in the search path will be used (regard are provided by directories later in the search path). The versioning system ensures that a given QML file will work regardless of the version -of installed software, since a versioned import \e only imports types for that version, +of installed software, since a versioned import \i only imports types for that version, leaving other identifiers available, even if the actual installed version might otherwise provide those identifiers. |