summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative/modules.qdoc
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2010-10-04 14:12:39 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2010-10-04 14:12:39 (GMT)
commit3ea28c383846a4af67ddd0c7d33dad0537a9972e (patch)
tree901f26b86b820ec4b4fc949ae38b6ce165b386af /doc/src/declarative/modules.qdoc
parent7cc2e423d39c3b519279d21cd3881f1a135913fd (diff)
parentd04664b9da6356d3c97e632fb35e27c6822e0dc9 (diff)
downloadQt-3ea28c383846a4af67ddd0c7d33dad0537a9972e.zip
Qt-3ea28c383846a4af67ddd0c7d33dad0537a9972e.tar.gz
Qt-3ea28c383846a4af67ddd0c7d33dad0537a9972e.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'doc/src/declarative/modules.qdoc')
-rw-r--r--doc/src/declarative/modules.qdoc8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc
index 2339d66..b5a6be1 100644
--- a/doc/src/declarative/modules.qdoc
+++ b/doc/src/declarative/modules.qdoc
@@ -52,7 +52,7 @@ An \c import statement includes the module name, and possibly a version number.
This can be seen in the snippet commonly found at the top of QML files:
\qml
- import Qt 4.7
+ import QtQuick 1.0
\endqml
This imports version 4.7 of the "Qt" module into the global namespace. (The QML
@@ -126,7 +126,7 @@ application code. When importing an installed module, an un-quoted URI is
used, with a mandatory version number:
\code
- import Qt 4.7
+ import QtQuick 1.0
import com.nokia.qml.mymodule 1.0
\endcode
@@ -181,7 +181,7 @@ By default, when a module is imported, its contents are imported into the global
To import a module into a specific namespace, use the \e as keyword:
\qml
- import Qt 4.7 as QtLibrary
+ import QtQuick 1.0 as QtLibrary
import "../MyComponents" as MyComponents
import com.nokia.qml.mymodule 1.0 as MyModule
\endqml
@@ -199,7 +199,7 @@ Types from these modules can then only be used when qualified by the namespace:
Multiple modules can be imported into the same namespace in the same way that multiple modules can be imported into the global namespace:
\qml
- import Qt 4.7 as Nokia
+ import QtQuick 1.0 as Nokia
import Ovi 1.0 as Nokia
\endqml