2 files changed, 13 insertions, 13 deletions

diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
index 95e6d5704c..a437b7ccc7 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
@@ -46,6 +46,7 @@
 #include <private/qv4objectiterator_p.h>
 #include <private/qv4identifier_p.h>
 #include <private/qv4runtime_p.h>
+#include <private/qv4identifiertable_p.h>
 
 #include <private/qqmlcontext_p.h>
 #include <private/qqmlengine_p.h>
@@ -96,18 +97,17 @@ int QV4DataCollector::encodeScopeType(QV4::Heap::ExecutionContext::ContextType s
 {
     switch (scopeType) {
     case QV4::Heap::ExecutionContext::Type_GlobalContext:
-        return 0;
-    case QV4::Heap::ExecutionContext::Type_CatchContext:
-        return 4;
+        break;
     case QV4::Heap::ExecutionContext::Type_WithContext:
         return 2;
     case QV4::Heap::ExecutionContext::Type_CallContext:
         return 1;
     case QV4::Heap::ExecutionContext::Type_QmlContext:
         return 3;
-    default:
-        return -1;
+    case QV4::Heap::ExecutionContext::Type_BlockContext:
+        return 4;
     }
+    return 0;
 }
 
 QV4DataCollector::QV4DataCollector(QV4::ExecutionEngine *engine)
@@ -268,9 +268,9 @@ bool QV4DataCollector::collectScope(QJsonObject *dict, int frameNr, int scopeNr)
         Refs collectedRefs;
 
         QV4::ScopedValue v(scope);
-        QV4::InternalClass *ic = ctxt->internalClass();
+        QV4::Heap::InternalClass *ic = ctxt->internalClass();
         for (uint i = 0; i < ic->size; ++i) {
-            QString name = ic->nameMap[i]->string;
+            QString name = ic->nameMap[i].toQString();
             names.append(name);
             v = static_cast<QV4::Heap::CallContext *>(ctxt->d())->locals[i];
             collectedRefs.append(collect(v));
@@ -394,18 +394,18 @@ QV4DataCollector::Ref QV4DataCollector::addRef(QV4::Value value, bool deduplicat
         { std::swap(*hasExceptionLoc, hadException); }
     };
 
-    // if we wouldn't do this, the putIndexed won't work.
+    // if we wouldn't do this, the put won't work.
     ExceptionStateSaver resetExceptionState(engine());
     QV4::Scope scope(engine());
     QV4::ScopedObject array(scope, m_values.value());
     if (deduplicate) {
         for (Ref i = 0; i < array->getLength(); ++i) {
-            if (array->getIndexed(i) == value.rawValue() && !m_specialRefs.contains(i))
+            if (array->get(i) == value.rawValue() && !m_specialRefs.contains(i))
                 return i;
         }
     }
     Ref ref = array->getLength();
-    array->putIndexed(ref, value);
+    array->put(ref, value);
     Q_ASSERT(array->getLength() - 1 == ref);
     return ref;
 }
@@ -415,7 +415,7 @@ QV4::ReturnedValue QV4DataCollector::getValue(Ref ref)
     QV4::Scope scope(engine());
     QV4::ScopedObject array(scope, m_values.value());
     Q_ASSERT(ref < array->getLength());
-    return array->getIndexed(ref, nullptr);
+    return array->get(ref, nullptr);
 }
 
 // TODO: Drop this method once we don't need to support namesAsObjects anymore
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
index 7950d21612..70f71de6ca 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
@@ -65,7 +65,7 @@ void JavaScriptJob::run()
     QV4::Scope scope(engine);
 
     QV4::ScopedContext ctx(scope, engine->currentStackFrame ? engine->currentContext()
-                                                            : engine->rootContext());
+                                                            : engine->scriptContext());
     QObject scopeObject;
 
     QV4::CppStackFrame *frame = engine->currentStackFrame;
@@ -103,7 +103,7 @@ void JavaScriptJob::run()
         }
     }
 
-    QV4::Script script(ctx, QV4::Compiler::EvalCode, this->script);
+    QV4::Script script(ctx, QV4::Compiler::ContextType::Eval, this->script);
     if (const QV4::Function *function = frame ? frame->v4Function : engine->globalCode)
         script.strictMode = function->isStrict();