diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2018-08-17 16:53:05 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-08-21 06:33:27 +0000 |
commit | 4b73fc5bd2fd3df10f1e7499c82da08fbd417055 (patch) | |
tree | 2eb2bbe263a9e4639c18f359a8fd1a20b4e6f28b /src/qml/doc/snippets/qml | |
parent | 1d769f0c5f76ad06466f873b0421e59e984a263b (diff) |
Add support for ECMASCript modules in WorkerScript elements
Similar to script imports from .qml files, the .mjs extension is used to
distinguish between ES modules and plain script files.
Change-Id: Id5f9b59fb77e99e3c9d6a404e6d091d96b501ad6
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/doc/snippets/qml')
-rw-r--r-- | src/qml/doc/snippets/qml/workerscript/script.mjs (renamed from src/qml/doc/snippets/qml/workerscript/script.js) | 0 | ||||
-rw-r--r-- | src/qml/doc/snippets/qml/workerscript/workerscript.qml | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/doc/snippets/qml/workerscript/script.js b/src/qml/doc/snippets/qml/workerscript/script.mjs index f55dee3507..f55dee3507 100644 --- a/src/qml/doc/snippets/qml/workerscript/script.js +++ b/src/qml/doc/snippets/qml/workerscript/script.mjs diff --git a/src/qml/doc/snippets/qml/workerscript/workerscript.qml b/src/qml/doc/snippets/qml/workerscript/workerscript.qml index e3fe3c92e6..cc637d34cf 100644 --- a/src/qml/doc/snippets/qml/workerscript/workerscript.qml +++ b/src/qml/doc/snippets/qml/workerscript/workerscript.qml @@ -61,7 +61,7 @@ Rectangle { WorkerScript { id: myWorker - source: "script.js" + source: "script.mjs" onMessage: myText.text = messageObject.reply } |