aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/doc/src/appdevguide
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2012-08-02 13:06:09 +1000
committerQt by Nokia <qt-info@nokia.com>2012-08-03 09:47:47 +0200
commit21f6b4d381c31bb9cdca5c28c15add250abdd5ab (patch)
tree253ef4d9d8ffae1615000e044d3f27da82147d5c /src/quick/doc/src/appdevguide
parent877e6c8093db2e479d9c6317479b72ae38eabdde (diff)
Fix various broken links in documentation
Change-Id: I9e2dac37d18e3ca62e4a92be25e5c2e60ffeba00 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src/quick/doc/src/appdevguide')
-rw-r--r--src/quick/doc/src/appdevguide/deployment.qdoc2
-rw-r--r--src/quick/doc/src/appdevguide/glossary.qdoc2
-rw-r--r--src/quick/doc/src/appdevguide/porting.qdoc2
-rw-r--r--src/quick/doc/src/appdevguide/quickstart/components.qdoc6
4 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/doc/src/appdevguide/deployment.qdoc b/src/quick/doc/src/appdevguide/deployment.qdoc
index 2104bb6552..916483a0d9 100644
--- a/src/quick/doc/src/appdevguide/deployment.qdoc
+++ b/src/quick/doc/src/appdevguide/deployment.qdoc
@@ -128,7 +128,7 @@ loaded as a QQmlComponent instance rather than placed into a view:
}
\endcode
-See \l{qtqml-cppintegration-data.html}{Exposing C++ Data to QML} for more information about using
+See \l{qtqml-cppintegration-data.html}{qtqml-cppintegration-exposecppattributes.html}{Exposing Attributes of C++ Types to QML} for more information about using
QQmlEngine, QQmlContext and QQmlComponent, as well
as details on including QML files through \l{The Qt Resource System}{Qt's Resource system}.
diff --git a/src/quick/doc/src/appdevguide/glossary.qdoc b/src/quick/doc/src/appdevguide/glossary.qdoc
index 65b9b3374d..a3b6db8a14 100644
--- a/src/quick/doc/src/appdevguide/glossary.qdoc
+++ b/src/quick/doc/src/appdevguide/glossary.qdoc
@@ -159,7 +159,7 @@
\li Signal
\li A signal is a notification from a QML object. When an object emits
a signal, other objects can receive and process this signal through
- a \l{qtqml-syntax-objectattributes.html#signal-handlers}{signal handler}.
+ a \l{Signal Attributes}{signal handler}.
Most properties of QML objects
have a change signal, and also an associated change signal handler
diff --git a/src/quick/doc/src/appdevguide/porting.qdoc b/src/quick/doc/src/appdevguide/porting.qdoc
index eb1bb63db9..f4937fa658 100644
--- a/src/quick/doc/src/appdevguide/porting.qdoc
+++ b/src/quick/doc/src/appdevguide/porting.qdoc
@@ -67,7 +67,7 @@ Qt.inputMethod.hide() to show and hide the virtual keyboard.
XmlListModel and XmlRole types must import \e {QtQuick.XmlListModel} instead.
\li The local storage API that enables SQL support has been moved from the \l {QML Global Object}
into a \c QtQuick.LocalStorage module API. Any code that requires the local storage API must import
-\e {QtQuick.LocalStorage} with a namespaced import instead. See the \l LocalStorage documentation
+\e {QtQuick.LocalStorage} with a namespaced import instead. See the \l \l{QtQuick.LocalStorage 2}{QtQuick.LocalStorage} documentation
for examples.
\li The \c LayoutItem type has been removed from the \c QtQuick module as it was specific to the
Graphics View framework backend used in QtQuick 1.
diff --git a/src/quick/doc/src/appdevguide/quickstart/components.qdoc b/src/quick/doc/src/appdevguide/quickstart/components.qdoc
index b11f849a75..989eefad09 100644
--- a/src/quick/doc/src/appdevguide/quickstart/components.qdoc
+++ b/src/quick/doc/src/appdevguide/quickstart/components.qdoc
@@ -211,7 +211,7 @@ arrays. See the \l {list}{list type documentation} for details.
Adding a \c property to an item automatically adds a \e {value changed}
signal handler to the item. To connect to this signal, use a
-\l{qtqml-syntax-objectattributes.html#signal-handlers}{signal handler}
+\l{Signal Attributes}{signal handler}
named with the \c on<Property>Changed syntax, using upper case for the first letter of the
property name.
@@ -431,7 +431,7 @@ performAction signal above; the allowed parameter types are the same as those li
{Adding Properties} section on this page.
Adding a signal to an item automatically adds a
-\l{qtqml-syntax-objectattributes.html#signal-handlers}{signal handler} as well.
+\l{Signal Attributes}{signal handler} as well.
The signal hander is named \c on<SignalName>, with the first letter of the signal being upper
cased. The above example item would now have the following signal handlers:
@@ -467,7 +467,7 @@ Signal objects have a \c connect() method that can be used to a connect a signal
another signal. When a signal is connected to a method, the method is automatically invoked
whenever the signal is emitted. (In Qt terminology, the method is a \e slot that is connected
to the \e signal; all methods defined in QML are created as Qt slots.) This enables a signal
-to be received by a method instead of a \l{qtqml-syntax-objectattributes.html#signal-handlers}
+to be received by a method instead of a \l{Signal Attributes}
{signal handler}.
For example, the \c application.qml above could be rewritten as: