summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2011-02-09 08:21:30 (GMT)
committerBea Lam <bea.lam@nokia.com>2011-02-09 08:21:30 (GMT)
commit6129a16a74620916d3e8bff29a3788374ca21c94 (patch)
tree7f9960f986e822c897c6230c4a18f6b717ed7106 /doc
parent3ebbb660d6f0c29b438f49dc8187b1b353ee1b8a (diff)
parent1759f7d688903210a142d7f93a6d173c52995d2f (diff)
downloadQt-6129a16a74620916d3e8bff29a3788374ca21c94.zip
Qt-6129a16a74620916d3e8bff29a3788374ca21c94.tar.gz
Qt-6129a16a74620916d3e8bff29a3788374ca21c94.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts: tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro Change-Id: I8da521f05ebc266d91caa582852155b571d5cc63
Diffstat (limited to 'doc')
-rw-r--r--doc/src/declarative/modules.qdoc9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc
index 1dca28c..4b2b33a 100644
--- a/doc/src/declarative/modules.qdoc
+++ b/doc/src/declarative/modules.qdoc
@@ -134,6 +134,15 @@ Installed modules that are installed into the import path or created
as a \l{QDeclarativeExtensionPlugin}{QML C++ plugin} must define a
\l{Writing a qmldir file}{qmldir file}.
+Modules that are installed into the import path translate the URI into
+directory names. For example, the qmldir file of the module \c com.nokia.qml.mymodule
+must be located in the subpath \c com/nokia/qml/mymodule/qmldir somewhere in the
+QML import path. In addition it is possible to store different versions of the
+module in subdirectories of its own. For example, a version 2.1 of the
+module could be located under \c com/nokia/qml/mymodule.2/qmldir or
+\c com/nokia/qml/mymodule.2.1/qmldir. The engine will automatically load
+the module which matches best.
+
\section2 The QML import path