aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/doc/src/syntax
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2012-08-27 17:04:17 +1000
committerQt by Nokia <qt-info@nokia.com>2012-08-28 04:32:48 +0200
commitc5e46a63b2dac24e411b904019ef9e87a832791b (patch)
treeeb20cfd12dcef0d17fb84ee5005418b19cf0b5ff /src/qml/doc/src/syntax
parent4a4a08d61a9771b5f49d7377b48d821075df3d97 (diff)
Fix various doc errors
Also restore the main module "reference documentation" links added in 0e0f46c01cf6a183996d36c31987ca4a46b50bd9 Change-Id: I421f5a17e2946a2569537d8ba8a021f219aaf75a Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src/qml/doc/src/syntax')
-rw-r--r--src/qml/doc/src/syntax/imports.qdoc16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/doc/src/syntax/imports.qdoc b/src/qml/doc/src/syntax/imports.qdoc
index 51c80ea6c8..e9e7cd0372 100644
--- a/src/qml/doc/src/syntax/imports.qdoc
+++ b/src/qml/doc/src/syntax/imports.qdoc
@@ -48,9 +48,9 @@ The most common type of import is a module import. Clients can import
types and JavaScript resources into a given namespace.
The generic form of a module import is as follows:
-\qml
+\code
import <ModuleIdentifier> <Version.Number> [as <Qualifier>]
-\endqml
+\endcode
\list
\li The \c <ModuleIdentifier> is an identifier specified in dotted URI
@@ -68,9 +68,9 @@ import <ModuleIdentifier> <Version.Number> [as <Qualifier>]
\endlist
An example of an unqualified module import is as follows:
-\qml
+\code
import QtQuick 2.0
-\endqml
+\endcode
This import allows the use of all of the types provided by the \c QtQuick
module without needing to specify a qualifier. For example, the client code to
@@ -87,9 +87,9 @@ Rectangle {
\endqml
An example of a qualified module import is as follows:
-\qml
+\code
import QtQuick 2.0 as Quick
-\endqml
+\endcode
This import allows multiple modules which provide conflicting type names to be
imported at the same time, however since each usage of a type provided by a
@@ -219,9 +219,9 @@ JavaScript resources may be imported directly in a QML document. Every
JavaScript resource must have an identifier by which it is accessed.
The generic form of a JavaScript resource import is as follows:
-\qml
+\code
import "<JavaScriptFile>" as <Identifier>
-\endqml
+\endcode
Note that the \c <Identifier> must be unique within a QML document, unlike the
local namespace qualifier which can be applied to module imports.