aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmlworkerscript/qquickworkerscript.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/qmlworkerscript/qquickworkerscript.cpp')
-rw-r--r--src/qmlworkerscript/qquickworkerscript.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/qmlworkerscript/qquickworkerscript.cpp b/src/qmlworkerscript/qquickworkerscript.cpp
index 336c3d5edb..0aa9b936c8 100644
--- a/src/qmlworkerscript/qquickworkerscript.cpp
+++ b/src/qmlworkerscript/qquickworkerscript.cpp
@@ -230,10 +230,12 @@ void QQuickWorkerScriptEnginePrivate::processLoad(int id, const QUrl &url)
script->source = url;
if (fileName.endsWith(QLatin1String(".mjs"))) {
- auto moduleUnit = engine->loadModule(url);
- if (moduleUnit) {
- if (moduleUnit->instantiate(engine))
- moduleUnit->evaluate();
+ auto module = engine->loadModule(url);
+ if (module.compiled) {
+ if (module.compiled->instantiate(engine))
+ module.compiled->evaluate();
+ } else if (module.native) {
+ // Nothing to do. There is no global code in a native module.
} else {
engine->throwError(QStringLiteral("Could not load module file"));
}