diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-03-01 10:42:06 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-03-04 10:08:03 +0000 |
| commit | ce1680fb017ef141106f74afd318632a712547e1 (patch) | |
| tree | acd0ea85032d5957e8c981afbbd8dd664495ec19 /src/qml/doc/snippets/qml | |
| parent | af055ca5793a4a3a3e306e8bc605665e6ae24bfd (diff) | |
Doc: Promote use of ECMAScript modules over Qt.include()
Also, mention that Qt.include() is deprecated.
[ChangeLog][QtQml] Qt.include() is deprecated in favor of ECMAScript
modules.
Task-number: QTBUG-74068
Change-Id: Ia13e4f1577d86b869a9a1cd810a82ff0b27ea0cc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
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( |