aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/qml/compiler/qv4compilercontext.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/qml/compiler/qv4compilercontext.cpp b/src/qml/compiler/qv4compilercontext.cpp
index 872fc94dc9..08fb2ee993 100644
--- a/src/qml/compiler/qv4compilercontext.cpp
+++ b/src/qml/compiler/qv4compilercontext.cpp
@@ -174,7 +174,10 @@ Context::ResolvedName Context::resolveName(const QString &name, const QQmlJS::So
c = c->parent;
}
- if (c && c->contextType == ContextType::ESModule) {
+ if (!c)
+ return result;
+
+ if (c->contextType == ContextType::ESModule) {
for (int i = 0; i < c->importEntries.count(); ++i) {
if (c->importEntries.at(i).localName == name) {
result.index = i;