summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/declarative/script.js
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2011-01-21 15:33:57 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2011-01-21 15:33:57 (GMT)
commit226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22 (patch)
tree491c25c4c9f08b6ef732a9179d2e64776a9e8446 /doc/src/snippets/declarative/script.js
parent84a1df764bf2e29e9e6e43f4f0e1a69201199fbc (diff)
parent59a35a794e433f9526aff72025c0899e76ef362e (diff)
downloadQt-226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22.zip
Qt-226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22.tar.gz
Qt-226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22.tar.bz2
Merge branch '4.7' into qdoc-simplified
Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp src/declarative/util/qdeclarativeanimation.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 })
+}