diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-04-21 07:43:15 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-04-21 07:43:15 (GMT) |
| commit | edc74eecf2967b295c7b881977527474be8e1c80 (patch) | |
| tree | 3c5ae43a22268ce3295ca97f34d06334bb10ec52 /examples | |
| parent | c2a551b280546d6c94362b40486fab7a6a5b17a3 (diff) | |
| parent | 85cd533284175c1c83d538d3bb2f0d02dc2bbf7a (diff) | |
| download | Qt-edc74eecf2967b295c7b881977527474be8e1c80.zip Qt-edc74eecf2967b295c7b881977527474be8e1c80.tar.gz Qt-edc74eecf2967b295c7b881977527474be8e1c80.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/declarative/listmodel-threaded/dataloader.js | 5 | ||||
| -rw-r--r-- | examples/declarative/listmodel-threaded/timedisplay.qml | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/examples/declarative/listmodel-threaded/dataloader.js b/examples/declarative/listmodel-threaded/dataloader.js index eac7478..d720f09 100644 --- a/examples/declarative/listmodel-threaded/dataloader.js +++ b/examples/declarative/listmodel-threaded/dataloader.js @@ -1,14 +1,9 @@ // ![0] WorkerScript.onMessage = function(msg) { - console.log("Worker told to", msg.action); - if (msg.action == 'appendCurrentTime') { var data = {'time': new Date().toTimeString()}; msg.model.append(data); msg.model.sync(); // updates the changes to the list - - var msgToSend = {'msg': 'Model updated!'}; - WorkerScript.sendMessage(msgToSend); } } // ![0] diff --git a/examples/declarative/listmodel-threaded/timedisplay.qml b/examples/declarative/listmodel-threaded/timedisplay.qml index 80ac9fa..bad7010 100644 --- a/examples/declarative/listmodel-threaded/timedisplay.qml +++ b/examples/declarative/listmodel-threaded/timedisplay.qml @@ -15,9 +15,6 @@ ListView { WorkerScript { id: worker source: "dataloader.js" - onMessage: { - console.log("Worker said", messageObject.msg); - } } Timer { |