diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-08 01:01:22 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-08 01:01:22 +0100 |
| commit | 5ad4faf773b9b21680f703d345bbbe08cb029772 (patch) | |
| tree | d16c5065bcb48aa992278cd10431a5d6467b7a24 /src/qml/doc/snippets/qml | |
| parent | 80f9634f7e3a1c31cda0c804d811c532aeee103b (diff) | |
| parent | 014e7a91f20eb01bac3ec99cea5c76053ae4b59e (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I7aa5284298990062fac9d9f1ab55d05f9b225ac9
Diffstat (limited to 'src/qml/doc/snippets/qml')
| -rw-r--r-- | src/qml/doc/snippets/qml/integrating-javascript/includejs/app.qml | 2 | ||||
| -rw-r--r-- | src/qml/doc/snippets/qml/integrating-javascript/includejs/factorial.mjs (renamed from src/qml/doc/snippets/qml/integrating-javascript/includejs/factorial.js) | 4 | ||||
| -rw-r--r-- | src/qml/doc/snippets/qml/integrating-javascript/includejs/script.mjs (renamed from src/qml/doc/snippets/qml/integrating-javascript/includejs/script.js) | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/doc/snippets/qml/integrating-javascript/includejs/app.qml b/src/qml/doc/snippets/qml/integrating-javascript/includejs/app.qml index 5339fcddce..e2104f8740 100644 --- a/src/qml/doc/snippets/qml/integrating-javascript/includejs/app.qml +++ b/src/qml/doc/snippets/qml/integrating-javascript/includejs/app.qml @@ -49,7 +49,7 @@ ****************************************************************************/ //![0] import QtQuick 2.0 -import "script.js" as MyScript +import "script.mjs" as MyScript Item { width: 100; height: 100 diff --git a/src/qml/doc/snippets/qml/integrating-javascript/includejs/factorial.js b/src/qml/doc/snippets/qml/integrating-javascript/includejs/factorial.mjs index f2e31265e3..d0a09b68ad 100644 --- a/src/qml/doc/snippets/qml/integrating-javascript/includejs/factorial.js +++ b/src/qml/doc/snippets/qml/integrating-javascript/includejs/factorial.mjs @@ -48,8 +48,8 @@ ** ****************************************************************************/ //![0] -// factorial.js -function factorial(a) { +// factorial.mjs +export function factorial(a) { a = parseInt(a); if (a <= 0) return 1; diff --git a/src/qml/doc/snippets/qml/integrating-javascript/includejs/script.js b/src/qml/doc/snippets/qml/integrating-javascript/includejs/script.mjs index c44b39abda..ef7688693d 100644 --- a/src/qml/doc/snippets/qml/integrating-javascript/includejs/script.js +++ b/src/qml/doc/snippets/qml/integrating-javascript/includejs/script.mjs @@ -49,7 +49,7 @@ ****************************************************************************/ //![0] // script.js -Qt.include("factorial.js") +import { factorial } from "factorial.mjs" function showCalculations(value) { console.log( |