diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:06:14 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:06:15 +0200 |
| commit | 55490690f81eba168b06a90e4a66cefc20b38252 (patch) | |
| tree | 9c6b6b9234aa767af1c69cac4d4cf896f292be20 /src/qml/compiler/qqmlirbuilder.cpp | |
| parent | 5624e82d068ebab254239121810fc097af7fcb40 (diff) | |
| parent | d8f84e5769632544dfac5138348481330c4da4cd (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I61ab3d0bd8cc02f640c60c037226eace09ec09ba
Diffstat (limited to 'src/qml/compiler/qqmlirbuilder.cpp')
| -rw-r--r-- | src/qml/compiler/qqmlirbuilder.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp index de04116a6b..f766f0e4c8 100644 --- a/src/qml/compiler/qqmlirbuilder.cpp +++ b/src/qml/compiler/qqmlirbuilder.cpp @@ -1961,7 +1961,7 @@ QV4::IR::Expr *JSCodeGen::fallbackNameLookup(const QString &name, int line, int // with the correct QML context. // Look for IDs first. - for (const IdMapping &mapping : qAsConst(_idObjects)) + for (const IdMapping &mapping : qAsConst(_idObjects)) { if (name == mapping.name) { if (_function->isQmlBinding) _function->idObjectDependencies.insert(mapping.idIndex); @@ -1979,8 +1979,9 @@ QV4::IR::Expr *JSCodeGen::fallbackNameLookup(const QString &name, int line, int result->isReadOnly = true; // don't allow use as lvalue return result; } + } - { + if (name.at(0).isUpper()) { QQmlTypeNameCache::Result r = imports->query(name); if (r.isValid()) { if (r.scriptIndex != -1) { |