summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/declarative/script.js
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2011-03-01 23:26:13 (GMT)
committerMartin Jones <martin.jones@nokia.com>2011-03-01 23:26:13 (GMT)
commit95814418f9d6adeba365c795462e8afb00138211 (patch)
treef7528ae97d136474ae300daa513acc0250f02d4e /doc/src/snippets/declarative/script.js
parent88253db8a7d7910e1393b1948fb3747117538c92 (diff)
parent119a8ddcd7c8de0607309b37f9ef83439b607f17 (diff)
downloadQt-95814418f9d6adeba365c795462e8afb00138211.zip
Qt-95814418f9d6adeba365c795462e8afb00138211.tar.gz
Qt-95814418f9d6adeba365c795462e8afb00138211.tar.bz2
Merge branch '4.7' into qtquick11
Conflicts: src/declarative/graphicsitems/qdeclarativelistview.cpp Change-Id: Ic21311365c6139520ae337a379bdedb6ffe497db
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 })
+}