Implement loading of resolved imported scripts

We can resolve the use of names that refer to imported scripts at compile
time and load them at run-time by index through context->importedScripts.

Change-Id: I681b19e7d68dbf3b9a68af00b4cea2a9254c2d78
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 11 insertions, 3 deletions

diff --git a/src/qml/compiler/qv4isel_p.cpp b/src/qml/compiler/qv4isel_p.cpp
index d6f0b4b804..3b7509d7bf 100644
--- a/src/qml/compiler/qv4isel_p.cpp
+++ b/src/qml/compiler/qv4isel_p.cpp
@@ -140,9 +140,17 @@ void IRDecoder::visitMove(V4IR::Move *s)
                 return;
             }
         } else if (V4IR::Member *m = s->source->asMember()) {
-            if (m->type == V4IR::Member::MemberByObjectId) {
-                loadIdObject(m->objectId, t);
-                return;
+            if (m->type == V4IR::Member::MemberOfQmlContext) {
+                V4IR::Name *base = m->base->asName();
+                Q_ASSERT(base);
+
+                if (base->builtin == V4IR::Name::builtin_qml_id_scope) {
+                    loadQmlIdObject(m->memberIndex, t);
+                    return;
+                } else if (base->builtin == V4IR::Name::builtin_qml_imported_scripts_scope) {
+                    loadQmlImportedScript(m->memberIndex, t);
+                    return;
+                }
             } else if (m->type == V4IR::Member::MemberOfQObject) {
                 getQObjectProperty(m->base, m->property->coreIndex, t);
                 return;