diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-15 08:57:58 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-15 09:10:12 +0200 |
| commit | 9f3aefb086c5f9d6b9dd192689bdd473da07186a (patch) | |
| tree | 93349812f4a46305edf5e27f7e737d952e0d9a3a /src/qml/compiler/qqmlirbuilder.cpp | |
| parent | a021bd87755ccfbe49e132f942ded935c9719b00 (diff) | |
| parent | d2bb2e202427ebae545a408f065c893f3d837061 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/qml/compiler/qv4codegen.cpp
Change-Id: I3c41b9fc9ba7d41741e4dd400402ae80dd7726d9
Diffstat (limited to 'src/qml/compiler/qqmlirbuilder.cpp')
| -rw-r--r-- | src/qml/compiler/qqmlirbuilder.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp index f766f0e4c8..d8cd31de29 100644 --- a/src/qml/compiler/qqmlirbuilder.cpp +++ b/src/qml/compiler/qqmlirbuilder.cpp @@ -1985,7 +1985,8 @@ QV4::IR::Expr *JSCodeGen::fallbackNameLookup(const QString &name, int line, int QQmlTypeNameCache::Result r = imports->query(name); if (r.isValid()) { if (r.scriptIndex != -1) { - return subscript(_block->TEMP(_importedScriptsTemp), _block->CONST(QV4::IR::SInt32Type, r.scriptIndex)); + return _block->SUBSCRIPT(_block->TEMP(_importedScriptsTemp), + _block->CONST(QV4::IR::SInt32Type, r.scriptIndex)); } else if (r.type) { QV4::IR::Name *typeName = _block->NAME(name, line, col); // Make sure the run-time loads this through the more efficient singleton getter. |