1 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4debugging.cpp b/src/qml/jsruntime/qv4debugging.cpp
index 4170b6817f..9ab1622fee 100644
--- a/src/qml/jsruntime/qv4debugging.cpp
+++ b/src/qml/jsruntime/qv4debugging.cpp
@@ -179,7 +179,7 @@ void Debugger::resume(Speed speed)
         return;
 
     if (!m_returnedValue.isUndefined())
-        m_returnedValue = Primitive::undefinedValue();
+        m_returnedValue = Encode::undefined();
 
     clearTemporaryBreakPoints();
     if (speed == StepOver)
@@ -648,15 +648,15 @@ void Debugger::applyPendingBreakPoints()
 void Debugger::setBreakOnInstruction(Function *function, qptrdiff codeOffset, bool onoff)
 {
     uchar *codePtr = const_cast<uchar *>(function->codeData) + codeOffset;
-    QQmlJS::Moth::Instr *instruction = reinterpret_cast<QQmlJS::Moth::Instr*>(codePtr);
-    instruction->common.breakPoint = onoff;
+    QQmlJS::Moth::Instr::instr_debug *debug = reinterpret_cast<QQmlJS::Moth::Instr::instr_debug *>(codePtr);
+    debug->breakPoint = onoff;
 }
 
 bool Debugger::hasBreakOnInstruction(Function *function, qptrdiff codeOffset)
 {
     uchar *codePtr = const_cast<uchar *>(function->codeData) + codeOffset;
-    QQmlJS::Moth::Instr *instruction = reinterpret_cast<QQmlJS::Moth::Instr*>(codePtr);
-    return instruction->common.breakPoint;
+    QQmlJS::Moth::Instr::instr_debug *debug = reinterpret_cast<QQmlJS::Moth::Instr::instr_debug *>(codePtr);
+    return debug->breakPoint;
 }
 
 bool Debugger::reallyHitTheBreakPoint(const QString &filename, int linenr)