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/types | |
| 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/types')
| -rw-r--r-- | src/qml/types/qqmllistmodel.cpp | 6 | ||||
| -rw-r--r-- | src/qml/types/qquickworkerscript.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
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: |