summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2010-12-20 04:30:09 (GMT)
committerBea Lam <bea.lam@nokia.com>2010-12-20 04:36:15 (GMT)
commit0aeebdc851682d2afd63494ddeafa4e745ad2b72 (patch)
treec6f1e0219ed94aa2d8a2c75268197e225fc9547a
parent97b039438bc31bb420138d72549372adb1244dc8 (diff)
downloadQt-0aeebdc851682d2afd63494ddeafa4e745ad2b72.zip
Qt-0aeebdc851682d2afd63494ddeafa4e745ad2b72.tar.gz
Qt-0aeebdc851682d2afd63494ddeafa4e745ad2b72.tar.bz2
Update docs on importing javascript files
-rw-r--r--doc/src/declarative/javascriptblocks.qdoc4
-rw-r--r--doc/src/declarative/modules.qdoc2
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/src/declarative/javascriptblocks.qdoc b/doc/src/declarative/javascriptblocks.qdoc
index 155bd6e..68cb392 100644
--- a/doc/src/declarative/javascriptblocks.qdoc
+++ b/doc/src/declarative/javascriptblocks.qdoc
@@ -99,7 +99,9 @@ resource, the component's \l {QDeclarativeComponent::status()}{status} is set to
Imported JavaScript files are always qualified using the "as" keyword. The
qualifier for JavaScript files must be unique, so there is always a one-to-one
-mapping between qualifiers and JavaScript files.
+mapping between qualifiers and JavaScript files. (This also means qualifiers cannot
+be named the same as built-in JavaScript objects such as \c Date and \c Math).
+
\section2 Code-Behind Implementation Files
diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc
index 011eb63..bf9f5fd 100644
--- a/doc/src/declarative/modules.qdoc
+++ b/doc/src/declarative/modules.qdoc
@@ -216,6 +216,8 @@ JavaScript files must always be imported with a named import:
}
\endqml
+The qualifier ("MyScript" in the above example) must be unique within the QML document.
+Unlike ordinary modules, multiple scripts cannot be imported into the same namespace.
\section1 Writing a qmldir file