summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2010-12-06 07:49:04 (GMT)
committerBea Lam <bea.lam@nokia.com>2010-12-06 07:49:45 (GMT)
commit2051459dd9a257c6492c755a583ff331e7009012 (patch)
treed93e7fa3b87fe4d64eabad57809de72561ed3855 /doc/src
parentb74ec2156b2a1f1acd38443047da5bb26cb082b1 (diff)
downloadQt-2051459dd9a257c6492c755a583ff331e7009012.zip
Qt-2051459dd9a257c6492c755a583ff331e7009012.tar.gz
Qt-2051459dd9a257c6492c755a583ff331e7009012.tar.bz2
Some doc clarification for components and javascript integration
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/declarative/javascriptblocks.qdoc5
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/src/declarative/javascriptblocks.qdoc b/doc/src/declarative/javascriptblocks.qdoc
index 41b64da..155bd6e 100644
--- a/doc/src/declarative/javascriptblocks.qdoc
+++ b/doc/src/declarative/javascriptblocks.qdoc
@@ -94,9 +94,8 @@ Both relative and absolute JavaScript URLs can be imported. In the case of a
relative URL, the location is resolved relative to the location of the
\l {QML Document} that contains the import. If the script file is not accessible,
an error will occur. If the JavaScript needs to be fetched from a network
-resource, the QML document has a "Loading"
-\l {QDeclarativeComponent::status()}{status} until the script has been
-downloaded.
+resource, the component's \l {QDeclarativeComponent::status()}{status} is set to
+"Loading" until the script has been downloaded.
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