aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml
diff options
context:
space:
mode:
authorSze Howe Koh <szehowe.koh@gmail.com>2014-03-16 12:20:26 +0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-18 13:17:42 +0100
commit5a9b5148a1d3fb412ab9bae276c10ba1a44374b1 (patch)
tree99ec4b4e32e4fbd0e9d10705f5c38a1fd56a223b /src/qml
parent303db2e8a19ea1f2c1b8d5dc59e2754b0d03bd61 (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')
-rw-r--r--src/qml/doc/src/javascript/expressions.qdoc10
-rw-r--r--src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc2
-rw-r--r--src/qml/doc/src/qmllanguageref/syntax/signals.qdoc2
-rw-r--r--src/qml/types/qqmllistmodel.cpp6
-rw-r--r--src/qml/types/qquickworkerscript.cpp2
5 files changed, 11 insertions, 11 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
diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp
index 4a382a1dc5..82517bd3f4 100644
--- a/src/qml/types/qqmllistmodel.cpp
+++ b/src/qml/types/qqmllistmodel.cpp
@@ -1520,11 +1520,11 @@ QQmlListModelParser::ListInstruction *QQmlListModelParser::ListModelData::instru
The timer in the main example sends messages to the worker script by calling
\l WorkerScript::sendMessage(). When this message is received,
- \l{WorkerScript::onMessage}{WorkerScript.onMessage()} is invoked in \c dataloader.js,
+ \c WorkerScript.onMessage() is invoked in \c dataloader.js,
which appends the current time to the list model.
- Note the call to sync() from the \l{WorkerScript::onMessage}{WorkerScript.onMessage()}
- handler. You must call sync() or else the changes made to the list from the external
+ Note the call to sync() from the external thread.
+ You must call sync() or else the changes made to the list from that
thread will not be reflected in the list model in the main thread.
\sa {qml-data-models}{Data Models}, {declarative/threading/threadedlistmodel}{Threaded ListModel example}, {Qt QML}
diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp
index 45fa191bc9..111ef68a98 100644
--- a/src/qml/types/qquickworkerscript.cpp
+++ b/src/qml/types/qquickworkerscript.cpp
@@ -584,7 +584,7 @@ void QQuickWorkerScriptEngine::run()
that the main GUI thread is not blocked.
Messages can be passed between the new thread and the parent thread
- using \l sendMessage() and the \l {WorkerScript::onMessage}{onMessage()} handler.
+ using \l sendMessage() and the \c onMessage() handler.
An example: