diff options
author | Sze Howe Koh <szehowe.koh@gmail.com> | 2014-03-16 12:20:26 +0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-18 13:17:42 +0100 |
commit | 5a9b5148a1d3fb412ab9bae276c10ba1a44374b1 (patch) | |
tree | 99ec4b4e32e4fbd0e9d10705f5c38a1fd56a223b /src/qml/doc | |
parent | 303db2e8a19ea1f2c1b8d5dc59e2754b0d03bd61 (diff) |
Doc: Fix broken \qmlsignal links
Fix the breaks caused by the re-categorizing of \qmlsignal pages
Task-number: QTBUG-35846
Change-Id: I528ae16ec522fc902133e22d8f53c87a7f0d56ad
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/qml/doc')
-rw-r--r-- | src/qml/doc/src/javascript/expressions.qdoc | 10 | ||||
-rw-r--r-- | src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc | 2 | ||||
-rw-r--r-- | src/qml/doc/src/qmllanguageref/syntax/signals.qdoc | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/qml/doc/src/javascript/expressions.qdoc b/src/qml/doc/src/javascript/expressions.qdoc index 13238b2e43..02ca20cd28 100644 --- a/src/qml/doc/src/javascript/expressions.qdoc +++ b/src/qml/doc/src/javascript/expressions.qdoc @@ -143,11 +143,11 @@ Those signals can be handled by signal handler functions, which can be defined by clients to implement custom program logic. Suppose that a button represented by a Rectangle type has a MouseArea and a -Text label. The MouseArea will emit its "pressed" signal when the user presses -the defined interactive area, which will automatically trigger the -\l{MouseArea::}{onPressed} handler, which can be defined by clients. The QML -engine will execute the JavaScript expressions defined in the onPressed and -onReleased handlers, as required. Typically, a signal handler is bound to +Text label. The MouseArea will emit its \l{MouseArea::}{pressed} signal when the +user presses the defined interactive area, which will automatically trigger the +\c onPressed handler, which can be defined by clients. The QML +engine will execute the JavaScript expressions defined in the \c onPressed and +\c onReleased handlers, as required. Typically, a signal handler is bound to JavaScript expressions to initiate other events or to simply assign property values. diff --git a/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc b/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc index 2a9c94d22e..46a225ee30 100644 --- a/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc +++ b/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc @@ -633,7 +633,7 @@ defined by its implementation. 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::onClicked}{clicked} signal that is emitted when the user clicks +a \l {MouseArea::}{clicked} signal that is emitted when the user clicks within the mouse area. An object can be notified through a \l{Signal handler attributes} diff --git a/src/qml/doc/src/qmllanguageref/syntax/signals.qdoc b/src/qml/doc/src/qmllanguageref/syntax/signals.qdoc index 4f2351d564..3e830c1f3c 100644 --- a/src/qml/doc/src/qmllanguageref/syntax/signals.qdoc +++ b/src/qml/doc/src/qmllanguageref/syntax/signals.qdoc @@ -65,7 +65,7 @@ Rectangle { } \endqml -Looking at the \l MouseArea documentation, you can see the \l {MouseArea::onClicked}{clicked} signal is emitted with a parameter named \c mouse which is a \l MouseEvent object that contains further details about the mouse click event. This name can be referred to in our \c onClicked handler to access this parameter. For example, the \l MouseEvent type has \c x and \c y coordinates that allows us to print out the exact location where the mouse was clicked: +Looking at the \l MouseArea documentation, you can see the \l {MouseArea::}{clicked} signal is emitted with a parameter named \c mouse which is a \l MouseEvent object that contains further details about the mouse click event. This name can be referred to in our \c onClicked handler to access this parameter. For example, the \l MouseEvent type has \c x and \c y coordinates that allows us to print out the exact location where the mouse was clicked: \qml import QtQuick 2.0 |