aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4engine.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
-rw-r--r--src/qml/jsruntime/qv4engine.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index afb4355af9..50e9135510 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -2192,9 +2192,12 @@ ExecutionEngine::Module doFindModule(
const QMultiHash<QUrl, QQmlRefPointer<ExecutableCompilationUnit>> &compilationUnits,
const QUrl &url, const ExecutableCompilationUnit *referrer, NotFound &&notFound)
{
- const QUrl resolved = referrer
+ QUrl resolved = referrer
? referrer->finalUrl().resolved(QQmlMetaType::normalizedUrl(url))
: QQmlMetaType::normalizedUrl(url);
+ if (!resolved.path().endsWith(QLatin1String(".mjs")))
+ resolved.setFragment(QLatin1String("module"));
+
auto existingModule = compilationUnits.constFind(resolved);
if (existingModule != compilationUnits.constEnd())
return *existingModule;