aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/doc/src/javascript/expressions.qdoc
diff options
context:
space:
mode:
authorSze Howe Koh <szehowe.koh@gmail.com>2013-11-05 20:17:06 +0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-05 15:37:29 +0100
commit22c138abfce871a1d23f1cf1b98b448bcd3ec74f (patch)
tree6e3a8b03c4b87065529c5e2989505dacd4e2658b /src/qml/doc/src/javascript/expressions.qdoc
parente17ae3b8b716b00c7cb6156347101f2e789dbd58 (diff)
Doc: Fix broken links
Change-Id: Ie7408409ddbaa354370267f2dd74326ec56a4186 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'src/qml/doc/src/javascript/expressions.qdoc')
-rw-r--r--src/qml/doc/src/javascript/expressions.qdoc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/doc/src/javascript/expressions.qdoc b/src/qml/doc/src/javascript/expressions.qdoc
index a8e6fc8ac0..13238b2e43 100644
--- a/src/qml/doc/src/javascript/expressions.qdoc
+++ b/src/qml/doc/src/javascript/expressions.qdoc
@@ -71,7 +71,7 @@ logic. There are four ways that JavaScript can be used in a QML document:
\li \l{Method Attributes}{custom methods} can be defined
in QML files as JavaScript functions
\li JavaScript files providing functions and variables can be
- \l{Importing JavaScript Files in QML Documents}{imported} in a QML
+ \l{Importing JavaScript Resources in QML}{imported} in a QML
document
\endlist
@@ -103,7 +103,7 @@ property binding definition, as long as the result of the expression is a
value whose type can be assigned to the property.
There are two ways to define a property binding: the first (and most common)
-is, as previously shown, in a \l{QML Object Attributes#property-initialization}
+is, as previously shown, in a \l{QML Object Attributes#Value Assignment on Initialization}
{property initialization}. The second (and much rarer) way is to assign the
property a function returned from the \l{Qt::binding()}{Qt.binding()} function,
from within imperative JavaScript code, as shown below:
@@ -259,7 +259,7 @@ Item {
\endqml
For more information about loading external JavaScript files into QML, read
-the section about \l{Importing JavaScript Files in QML Documents}.
+the section about \l{Importing JavaScript Resources in QML}.