From f43c1d902d908c6cd523b0174338ac0c98a30647 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 16 Aug 2018 10:57:25 +0200 Subject: Add support for importing ES modules in .qml files This is a straight-forward hook into the module implementation in QV4::ExecutionEngine. Modules are pre-compiled in the QML type loader thread. That thread keeps track of all pending loading scripts through the type loader's m_scriptCache. Once a module is compiled, it's thread-safely registered with the execution engine. Script instantiation and evaluation is done solely in the QQmlEngine's thread. ES Modules are identified in imports as well as qmldir files by the .mjs extension. Change-Id: Ie9c59785118afcb49f43a1e176a9f7db00f09428 Reviewed-by: Lars Knoll --- tests/auto/qml/qqmllanguage/data/importJsModule.3.mjs | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 tests/auto/qml/qqmllanguage/data/importJsModule.3.mjs (limited to 'tests/auto/qml/qqmllanguage/data/importJsModule.3.mjs') diff --git a/tests/auto/qml/qqmllanguage/data/importJsModule.3.mjs b/tests/auto/qml/qqmllanguage/data/importJsModule.3.mjs new file mode 100644 index 0000000000..3623dc6f4f --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/importJsModule.3.mjs @@ -0,0 +1,4 @@ +export function indirectOk() { return true; } + +export * from "./importJsModule.3.indirect.mjs"; + -- cgit v1.2.3