diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-04-01 09:17:01 +0300 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-04-01 09:17:01 +0300 |
| commit | 8c1c579405cb4a3b039b171a1fa5d636deed9511 (patch) | |
| tree | 03cf54534220221cb4c4ddc85288ecaa052d8252 /src/qml/compiler/qv4compilercontext.cpp | |
| parent | 8ec25f301d08e981ca066755ffea582c5cbdf1b0 (diff) | |
| parent | 42f0b0b245d29118e91fffaddeafcbdb8b48cc63 (diff) | |
Merge 5.12 into 5.12.3
Change-Id: Ic25bb7ba2e9f404622157ef023e64c3d4d47263f
Diffstat (limited to 'src/qml/compiler/qv4compilercontext.cpp')
| -rw-r--r-- | src/qml/compiler/qv4compilercontext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/compiler/qv4compilercontext.cpp b/src/qml/compiler/qv4compilercontext.cpp index 84c5d67e8d..d1a5fee92b 100644 --- a/src/qml/compiler/qv4compilercontext.cpp +++ b/src/qml/compiler/qv4compilercontext.cpp @@ -190,7 +190,7 @@ Context::ResolvedName Context::resolveName(const QString &name, const QQmlJS::AS if (c->contextType == ContextType::Eval) return result; - if (c->contextType == ContextType::Binding) + if (c->contextType == ContextType::Binding || c->contextType == ContextType::ScriptImportedByQML) result.type = ResolvedName::QmlGlobal; else result.type = ResolvedName::Global; |