summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@nokia.com>2011-03-01 15:48:55 (GMT)
committerJerome Pasion <jerome.pasion@nokia.com>2011-03-01 15:48:55 (GMT)
commita19cbae234f134c1ec6cdcc9a23d5d14cc4fcff8 (patch)
tree32492e7e72fc05f7083fdd9c529374ab98127d4d /doc
parent77d621c21cd9b961cd7bbb5c782eb21a68e217ad (diff)
downloadQt-a19cbae234f134c1ec6cdcc9a23d5d14cc4fcff8.zip
Qt-a19cbae234f134c1ec6cdcc9a23d5d14cc4fcff8.tar.gz
Qt-a19cbae234f134c1ec6cdcc9a23d5d14cc4fcff8.tar.bz2
Fixed broken link.
Reviewed-by: David Boddie
Diffstat (limited to 'doc')
-rw-r--r--doc/src/declarative/javascriptblocks.qdoc6
-rw-r--r--doc/src/declarative/propertybinding.qdoc1
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/src/declarative/javascriptblocks.qdoc b/doc/src/declarative/javascriptblocks.qdoc
index 7ef7f9a..f78f3c2 100644
--- a/doc/src/declarative/javascriptblocks.qdoc
+++ b/doc/src/declarative/javascriptblocks.qdoc
@@ -205,7 +205,7 @@ component destruction.
Property bindings can be created in JavaScript by assigning the property with a \c function
that returns the required value.
-See \l {Binding Properties from JavaScript} for details.
+See \l {qml-javascript-assignment}{Property Assignment versus Property Binding} for details.
\section1 Receiving QML Signals in JavaScript
@@ -293,8 +293,8 @@ To run code after the environment setup has completed, refer to
\o The value of \c this is currently undefined in QML in the majority of contexts
-The \c this keyword is supported when \l {Binding Properties from JavaScript}
-{binding properties from JavaScript}. In all other situations, the value of
+The \c this keyword is supported when binding properties from JavaScript.
+In all other situations, the value of
\c this is undefined in QML.
To refer to any element, provide an \c id. For example:
diff --git a/doc/src/declarative/propertybinding.qdoc b/doc/src/declarative/propertybinding.qdoc
index afbbe4f..88ec5c3 100644
--- a/doc/src/declarative/propertybinding.qdoc
+++ b/doc/src/declarative/propertybinding.qdoc
@@ -78,6 +78,7 @@ overly complex - such as involving multiple lines, or imperative loops - it may
to refactor the component entirely, or at least factor the binding out into a separate
function.
+\keyword qml-javascript-assignment
\section1 Property Assignment versus Property Binding
When working with both QML and JavaScript, it is important to differentiate between