aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/doc/src/syntax
diff options
context:
space:
mode:
Diffstat (limited to 'src/qml/doc/src/syntax')
-rw-r--r--src/qml/doc/src/syntax/basics.qdoc2
-rw-r--r--src/qml/doc/src/syntax/imports.qdoc2
-rw-r--r--src/qml/doc/src/syntax/objectattributes.qdoc8
-rw-r--r--src/qml/doc/src/syntax/propertybinding.qdoc2
-rw-r--r--src/qml/doc/src/syntax/signals.qdoc6
5 files changed, 10 insertions, 10 deletions
diff --git a/src/qml/doc/src/syntax/basics.qdoc b/src/qml/doc/src/syntax/basics.qdoc
index afb0731fb2..786d208653 100644
--- a/src/qml/doc/src/syntax/basics.qdoc
+++ b/src/qml/doc/src/syntax/basics.qdoc
@@ -114,7 +114,7 @@ When placed into a \c .qml file and loaded by the QML engine, the above code cre
Rectangle { width: 200; height: 200; color: "red" }
\endqml
-Obviously, the \l Rectangle object declared in this example is very simple indeed, as it defines nothing more than a few property values. To create more useful objects, an object declaration may define many other types of attributes: these are discussed in the \l{qtqml-syntax-object-declaration.html}{Object Declarations} documentation. Additionally, an object declaration may define child objects, as discussed below.
+Obviously, the \l Rectangle object declared in this example is very simple indeed, as it defines nothing more than a few property values. To create more useful objects, an object declaration may define many other types of attributes: these are discussed in the \l{qtqml-syntax-objectattributes.html}{QML Object Attributes} documentation. Additionally, an object declaration may define child objects, as discussed below.
\section2 Child Objects
diff --git a/src/qml/doc/src/syntax/imports.qdoc b/src/qml/doc/src/syntax/imports.qdoc
index b68c29d99e..3519b3cc2f 100644
--- a/src/qml/doc/src/syntax/imports.qdoc
+++ b/src/qml/doc/src/syntax/imports.qdoc
@@ -153,7 +153,7 @@ The qualifier ("MyScript" in the above example) must be unique within the QML do
Unlike ordinary modules, multiple scripts cannot be imported into the same namespace.
Javascript files can be provided by modules, by adding Namespace definitions to the
-\l{Syntax of a qmldir file}{qmldir file} for the module. For example:
+\l{Adding Module Metadata with a qmldir file}{qmldir file} for the module. For example:
\code
SystemFunctions 1.0 SystemFunctions.js
diff --git a/src/qml/doc/src/syntax/objectattributes.qdoc b/src/qml/doc/src/syntax/objectattributes.qdoc
index 941d3c6198..ddfe70a425 100644
--- a/src/qml/doc/src/syntax/objectattributes.qdoc
+++ b/src/qml/doc/src/syntax/objectattributes.qdoc
@@ -415,7 +415,7 @@ In some cases properties contain a logical group of sub-property attributes.
These sub-property attributes can be assigned to using either the dot notation
or group notation.
-For example, the \l Text type has a \l{Text::font}{font} group property. Below,
+For example, the \l Text type has a \l{Text::font.family}{font} group property. Below,
the first \l Text object initializes its \c font values using dot notation,
while the second uses group notation:
@@ -605,7 +605,7 @@ Item {
A signal is a notification from an object that some event has occurred: for
example, a property has changed, an animation has started or stopped, or
when an image has been downloaded. The \l MouseArea type, for example, has
-a \l {MouseArea::clicked}{clicked} signal that is emitted when the user clicks
+a \l {MouseArea::onClicked}{clicked} signal that is emitted when the user clicks
within the mouse area.
An object can be notified through a \l{Signal handler attributes}
@@ -666,7 +666,7 @@ Item {
If the signal has no parameters, the "()" brackets are optional. If parameters
are used, the parameter types must be declared, as for the \c string and \c var
arguments for the \c actionPerformed signal above. The allowed parameter types
-are the same as those listed under \l {custom property types} on this page.
+are the same as those listed under \l {Defining Property Attributes} on this page.
To emit a signal, invoke it as a method. Any relevant
\l{Signal handler attributes}{signal handlers} will be invoked when the signal
@@ -842,7 +842,7 @@ prefixing the properties and respective signal handlers with the name of the
attaching type.
For example, the \l ListView type has an attached property
-\l ListView.isCurrentItem that is available to each delegate object in a
+\l {ListView::isCurrentItem}{ListView.isCurrentItem} that is available to each delegate object in a
ListView. This can be used by each individual delegate object to determine
whether it is the currently selected item in the view:
diff --git a/src/qml/doc/src/syntax/propertybinding.qdoc b/src/qml/doc/src/syntax/propertybinding.qdoc
index 75efc358dd..48c17ff244 100644
--- a/src/qml/doc/src/syntax/propertybinding.qdoc
+++ b/src/qml/doc/src/syntax/propertybinding.qdoc
@@ -186,7 +186,7 @@ In this case, the function could also have referred to \c rect.width rather than
\c this.width.
Note that the value of \c this is not defined outside of its use in property binding.
-See \l {QML JavaScript Restrictions} for details.
+See \l {JavaScript Expression Restrictions in QML} for details.
*/
diff --git a/src/qml/doc/src/syntax/signals.qdoc b/src/qml/doc/src/syntax/signals.qdoc
index 6cc68d30bf..3c203f36de 100644
--- a/src/qml/doc/src/syntax/signals.qdoc
+++ b/src/qml/doc/src/syntax/signals.qdoc
@@ -115,9 +115,9 @@ Even though the \l MouseArea documentation does not document a signal handler na
\section2 Using the Connections Type
-In some cases it may be desirable to access a signal outside of the object that emits it. For these purposes, the QtQuick module provides the \l Connections type for connecting to signals of arbitrary objects. A \l Connections object can receive any signal from its specified \l {Connection::target}{target}.
+In some cases it may be desirable to access a signal outside of the object that emits it. For these purposes, the QtQuick module provides the \l Connections type for connecting to signals of arbitrary objects. A \l Connections object can receive any signal from its specified \l {Connections::target}{target}.
-For example, the \c onClicked handler in the earlier example could have been received by the root \l Rectangle instead, by placing the \c onClicked handler in a \l Connections object that has its \l {Connection::target}{target} set to the \l MouseArea:
+For example, the \c onClicked handler in the earlier example could have been received by the root \l Rectangle instead, by placing the \c onClicked handler in a \l Connections object that has its \l {Connections::target}{target} set to the \l MouseArea:
\qml
import QtQuick 2.0
@@ -204,7 +204,7 @@ SquareButton {
}
\endqml
-See \l {Custom signals} for more details on writing signals for custom QML types.
+See \l {Signal Attributes} for more details on writing signals for custom QML types.
\keyword qml-connect-signals-to-method