diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-04-08 23:42:21 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-04-09 02:25:24 (GMT) |
| commit | ca266d0037713c05d19dd6db9ba04f0c01811676 (patch) | |
| tree | 3358d8217a71e66750542cffd09afdc941605fae | |
| parent | 9615dfeca337c9f40d96485d2dd248eb8cefd563 (diff) | |
| download | Qt-ca266d0037713c05d19dd6db9ba04f0c01811676.zip Qt-ca266d0037713c05d19dd6db9ba04f0c01811676.tar.gz Qt-ca266d0037713c05d19dd6db9ba04f0c01811676.tar.bz2 | |
Doc fixes
| -rw-r--r-- | doc/src/declarative/javascriptblocks.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/declarative/network.qdoc | 1 | ||||
| -rw-r--r-- | doc/src/declarative/qdeclarativedocument.qdoc | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/doc/src/declarative/javascriptblocks.qdoc b/doc/src/declarative/javascriptblocks.qdoc index c198295..3544bc9 100644 --- a/doc/src/declarative/javascriptblocks.qdoc +++ b/doc/src/declarative/javascriptblocks.qdoc @@ -163,7 +163,7 @@ component instance) "startup". While it is tempting to just include the startup script as \e {global code} in an external script file, this can have severe limitations as the QML environment may not have been fully established. For example, some objects might not have been created or some \l {Property Binding}s may not have been run. -\l {QML Script Restrictions} covers the exact limitations of global script code. +\l {QML JavaScript Restrictions} covers the exact limitations of global script code. The QML \l Component element provides an \e attached \c onCompleted property that can be used to trigger the execution of script code at startup after the diff --git a/doc/src/declarative/network.qdoc b/doc/src/declarative/network.qdoc index f1d4db1..0a26c68 100644 --- a/doc/src/declarative/network.qdoc +++ b/doc/src/declarative/network.qdoc @@ -64,7 +64,6 @@ Image { Network transparency is supported throughout QML, for example: \list -\o Scripts - the \c source property of \l Script is a URL \o Fonts - the \c source property of FontLoader is a URL \o WebViews - the \c url property of WebView (obviously!) \endlist diff --git a/doc/src/declarative/qdeclarativedocument.qdoc b/doc/src/declarative/qdeclarativedocument.qdoc index bf95a29..cf3aae2 100644 --- a/doc/src/declarative/qdeclarativedocument.qdoc +++ b/doc/src/declarative/qdeclarativedocument.qdoc @@ -83,7 +83,7 @@ modifies the document prior to presentation to the QML runtime. \c import statem do not "include" code in the document, but instead instruct the QML runtime on how to resolve type references found in the document. Any type reference present in a QML document - such as \c Rectangle and \c ListView - including those made within an -\l {JavaScript Block} or \l {Property Binding}s, are \e resolved based exclusively on the +\l {Inline JavaScript}{JavaScript block} or \l {Property Binding}s, are \e resolved based exclusively on the import statements. QML does not import any modules by default, so at least one \c import statement must be present or no elements will be available! |