diff options
| author | Michael Brasser <michael.brasser@jollamobile.com> | 2014-02-17 09:35:20 -0600 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-25 20:01:12 +0100 |
| commit | 7d25db8ff452926e58b7a66608666b35c194fc69 (patch) | |
| tree | 84a40cdc2f8654e73080ca608e3d3f9b98a50a55 /tests/auto/qml/qquickworkerscript/data | |
| parent | 2befbab62808fa75658cb974ce92e8b1ac558e8e (diff) | |
Fix global object handling in worker script JS files.v5.3.0-alpha1
Task-number: QTBUG-36874
Task-number: QTBUG-36881
Change-Id: Iacf4807dd37862e792ad1ba4ce540a6d48f1e495
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'tests/auto/qml/qquickworkerscript/data')
8 files changed, 45 insertions, 0 deletions
diff --git a/tests/auto/qml/qquickworkerscript/data/script_function.js b/tests/auto/qml/qquickworkerscript/data/script_function.js new file mode 100644 index 0000000000..c0391dd0ae --- /dev/null +++ b/tests/auto/qml/qquickworkerscript/data/script_function.js @@ -0,0 +1,8 @@ +function func() { + return "World" +} + +WorkerScript.onMessage = function(msg) { + WorkerScript.sendMessage(msg + " " + func()) +} + diff --git a/tests/auto/qml/qquickworkerscript/data/script_global.js b/tests/auto/qml/qquickworkerscript/data/script_global.js new file mode 100644 index 0000000000..cce4f2ceca --- /dev/null +++ b/tests/auto/qml/qquickworkerscript/data/script_global.js @@ -0,0 +1,5 @@ +WorkerScript.onMessage = function(msg) { + world = "World" + WorkerScript.sendMessage(msg + " " + world) +} + diff --git a/tests/auto/qml/qquickworkerscript/data/script_global2.js b/tests/auto/qml/qquickworkerscript/data/script_global2.js new file mode 100644 index 0000000000..0867f7ee76 --- /dev/null +++ b/tests/auto/qml/qquickworkerscript/data/script_global2.js @@ -0,0 +1,6 @@ +world = "World" + +WorkerScript.onMessage = function(msg) { + WorkerScript.sendMessage(msg + " " + world) +} + diff --git a/tests/auto/qml/qquickworkerscript/data/script_var.js b/tests/auto/qml/qquickworkerscript/data/script_var.js new file mode 100644 index 0000000000..77107e8344 --- /dev/null +++ b/tests/auto/qml/qquickworkerscript/data/script_var.js @@ -0,0 +1,6 @@ +var world = "World" + +WorkerScript.onMessage = function(msg) { + WorkerScript.sendMessage(msg + " " + world) +} + diff --git a/tests/auto/qml/qquickworkerscript/data/worker_function.qml b/tests/auto/qml/qquickworkerscript/data/worker_function.qml new file mode 100644 index 0000000000..f8d01dcfcc --- /dev/null +++ b/tests/auto/qml/qquickworkerscript/data/worker_function.qml @@ -0,0 +1,5 @@ +import QtQuick 2.0 + +BaseWorker { + source: "script_function.js" +} diff --git a/tests/auto/qml/qquickworkerscript/data/worker_global.qml b/tests/auto/qml/qquickworkerscript/data/worker_global.qml new file mode 100644 index 0000000000..546afd2f39 --- /dev/null +++ b/tests/auto/qml/qquickworkerscript/data/worker_global.qml @@ -0,0 +1,5 @@ +import QtQuick 2.0 + +BaseWorker { + source: "script_global.js" +} diff --git a/tests/auto/qml/qquickworkerscript/data/worker_global2.qml b/tests/auto/qml/qquickworkerscript/data/worker_global2.qml new file mode 100644 index 0000000000..42cad3852b --- /dev/null +++ b/tests/auto/qml/qquickworkerscript/data/worker_global2.qml @@ -0,0 +1,5 @@ +import QtQuick 2.0 + +BaseWorker { + source: "script_global2.js" +} diff --git a/tests/auto/qml/qquickworkerscript/data/worker_var.qml b/tests/auto/qml/qquickworkerscript/data/worker_var.qml new file mode 100644 index 0000000000..ea6a23cd3e --- /dev/null +++ b/tests/auto/qml/qquickworkerscript/data/worker_var.qml @@ -0,0 +1,5 @@ +import QtQuick 2.0 + +BaseWorker { + source: "script_var.js" +} |