diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-20 23:00:16 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-20 23:00:16 (GMT) |
| commit | ad23f356e503536b34ea8e59aa3390459d1bbfea (patch) | |
| tree | d4d2dd72b32b1b83ab9ae967af21609f11e46a46 /doc/src | |
| parent | 8bea6ea27ff47ff2a02cb6e8ef5b16b3a7d0f0d5 (diff) | |
| parent | 987a683ff51997cb23cb931af99c6554651742d7 (diff) | |
| download | Qt-ad23f356e503536b34ea8e59aa3390459d1bbfea.zip Qt-ad23f356e503536b34ea8e59aa3390459d1bbfea.tar.gz Qt-ad23f356e503536b34ea8e59aa3390459d1bbfea.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/declarative/javascriptblocks.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/declarative/modules.qdoc | 2 |
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 |