1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
index eeedb59ce6..718975275a 100644
--- a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
@@ -229,7 +229,7 @@ private:
 
     QV4::ExecutionEngine *m_engine;
     QQmlNativeDebugServiceImpl *m_service;
-    QV4::CppStackFrame *m_currentFrame = 0;
+    QV4::CppStackFrame *m_currentFrame = nullptr;
     Speed m_stepping;
     bool m_pauseRequested;
     bool m_runningJob;
@@ -457,7 +457,7 @@ void Collector::collect(QJsonArray *out, const QString &parentIName, const QStri
 void NativeDebugger::handleVariables(QJsonObject *response, const QJsonObject &arguments)
 {
     TRACE_PROTOCOL("Build variables");
-    QV4::CppStackFrame *frame = 0;
+    QV4::CppStackFrame *frame = nullptr;
     decodeFrame(arguments.value(QLatin1String("context")).toString(), &frame);
     if (!frame) {
         setError(response, QStringLiteral("No stack frame passed"));
@@ -500,7 +500,7 @@ void NativeDebugger::handleVariables(QJsonObject *response, const QJsonObject &a
 void NativeDebugger::handleExpressions(QJsonObject *response, const QJsonObject &arguments)
 {
     TRACE_PROTOCOL("Evaluate expressions");
-    QV4::CppStackFrame *frame = 0;
+    QV4::CppStackFrame *frame = nullptr;
     decodeFrame(arguments.value(QLatin1String("context")).toString(), &frame);
     if (!frame) {
         setError(response, QStringLiteral("No stack frame passed"));
@@ -713,7 +713,7 @@ void QQmlNativeDebugServiceImpl::engineAboutToBeAdded(QJSEngine *engine)
 {
     TRACE_PROTOCOL("Adding engine" << engine);
     if (engine) {
-        QV4::ExecutionEngine *ee = QV8Engine::getV4(engine->handle());
+        QV4::ExecutionEngine *ee = engine->handle();
         TRACE_PROTOCOL("Adding execution engine" << ee);
         if (ee) {
             NativeDebugger *debugger = new NativeDebugger(this, ee);
@@ -729,7 +729,7 @@ void QQmlNativeDebugServiceImpl::engineAboutToBeRemoved(QJSEngine *engine)
 {
     TRACE_PROTOCOL("Removing engine" << engine);
     if (engine) {
-        QV4::ExecutionEngine *executionEngine = QV8Engine::getV4(engine->handle());
+        QV4::ExecutionEngine *executionEngine = engine->handle();
         const auto debuggersCopy = m_debuggers;
         for (NativeDebugger *debugger : debuggersCopy) {
             if (debugger->engine() == executionEngine)