diff options
author | Warwick Allison <warwick.allison@nokia.com> | 2010-04-08 05:25:09 (GMT) |
---|---|---|
committer | Warwick Allison <warwick.allison@nokia.com> | 2010-04-08 05:25:09 (GMT) |
commit | a563fac8c17f284bdc7499225edc674e363f6dc8 (patch) | |
tree | 95c0cb5864a7242bed0ab7cc0b77994c7d4e7b5e /doc/src/declarative/modules.qdoc | |
parent | 23ca795df373ef41d2b3020c9ea7c38714aaa67b (diff) | |
parent | cabf4f41a51599b3527cd848af14966986430566 (diff) | |
download | Qt-a563fac8c17f284bdc7499225edc674e363f6dc8.zip Qt-a563fac8c17f284bdc7499225edc674e363f6dc8.tar.gz Qt-a563fac8c17f284bdc7499225edc674e363f6dc8.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'doc/src/declarative/modules.qdoc')
-rw-r--r-- | doc/src/declarative/modules.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc index d476d6f..68e58fb 100644 --- a/doc/src/declarative/modules.qdoc +++ b/doc/src/declarative/modules.qdoc @@ -150,7 +150,7 @@ types to be referenced, or purely for readability. To import a module into a namespace: \code -import Qt 4.6 as TheQtLibrary +import Qt 4.7 as TheQtLibrary \endcode Types from Qt 4.6 may then be used, but only by qualifying them with the namespace: @@ -163,7 +163,7 @@ Multiple modules can be imported into the same namespace in the same way that mu modules can be imported into the global namespace: \code -import Qt 4.6 as Nokia +import Qt 4.7 as Nokia import Ovi 1.0 as Nokia \endcode |