summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/declarative/script.js
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2011-01-25 13:26:14 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2011-01-25 13:26:14 (GMT)
commit195fbdfb7f9a8ade3347a651090722a7d3ecccfb (patch)
treeafd29e9eda1c4f898b1e6e78f23140e87454cdb5 /doc/src/snippets/declarative/script.js
parent9657c4fa2040758b8aa3a5f7f7c81442cbaba621 (diff)
parent67fbf125f3f96ea0ff0da66b1dd8b7dd348ca69f (diff)
downloadQt-195fbdfb7f9a8ade3347a651090722a7d3ecccfb.zip
Qt-195fbdfb7f9a8ade3347a651090722a7d3ecccfb.tar.gz
Qt-195fbdfb7f9a8ade3347a651090722a7d3ecccfb.tar.bz2
Merge branch '4.7' into jpasions-qt-doc-team-qtquick-4.7
Conflicts: doc/src/declarative/extending.qdoc doc/src/external-resources.qdoc src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativetransition.cpp
Diffstat (limited to 'doc/src/snippets/declarative/script.js')
-rw-r--r--doc/src/snippets/declarative/script.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/src/snippets/declarative/script.js b/doc/src/snippets/declarative/script.js
index cd67311..f55dee3 100644
--- a/doc/src/snippets/declarative/script.js
+++ b/doc/src/snippets/declarative/script.js
@@ -1 +1,4 @@
-# Just here so that workerscript.qml succeeds.
+WorkerScript.onMessage = function(message) {
+ // ... long-running operations and calculations are done here
+ WorkerScript.sendMessage({ 'reply': 'Mouse is at ' + message.x + ',' + message.y })
+}