diff options
Diffstat (limited to 'src/plugins')
5 files changed, 5 insertions, 9 deletions
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp index 430ba4f255..e89b7a63d4 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp +++ b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp @@ -76,7 +76,7 @@ QV4::Heap::SimpleCallContext *QV4DataCollector::findScope(QV4::ExecutionContext if (!ctxt) return 0; - QV4::Scope s(ctxt->d()->engine); + QV4::Scope s(ctxt); QV4::ScopedContext ctx(s, ctxt); for (; scope > 0 && ctx; --scope) ctx = ctx->d()->outer; diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp index 9e8be84c33..b82df9c6a9 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp +++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp @@ -260,7 +260,7 @@ QV4::Function *QV4Debugger::getFunction() const if (QV4::Function *function = context->getFunction()) return function; else - return context->d()->engine->globalCode; + return m_engine->globalCode; } void QV4Debugger::runJobUnpaused() diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp index 6cb1ab4051..d536fd51ed 100644 --- a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp +++ b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp @@ -465,7 +465,7 @@ void NativeDebugger::handleVariables(QJsonObject *response, const QJsonObject &a } TRACE_PROTOCOL("Context: " << executionContext); - QV4::ExecutionEngine *engine = executionContext->d()->engine; + QV4::ExecutionEngine *engine = executionContext->engine(); if (!engine) { setError(response, QStringLiteral("No execution engine passed")); return; @@ -520,7 +520,7 @@ void NativeDebugger::handleExpressions(QJsonObject *response, const QJsonObject } TRACE_PROTOCOL("Context: " << executionContext); - QV4::ExecutionEngine *engine = executionContext->d()->engine; + QV4::ExecutionEngine *engine = executionContext->engine(); if (!engine) { setError(response, QStringLiteral("No execution engine passed")); return; @@ -672,7 +672,7 @@ QV4::Function *NativeDebugger::getFunction() const if (QV4::Function *function = context->getFunction()) return function; else - return context->d()->engine->globalCode; + return m_engine->globalCode; } void NativeDebugger::pauseAndWait() diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp index 90e817e2fc..510c745d4e 100644 --- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp +++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp @@ -66,8 +66,6 @@ QQmlProfilerAdapter::QQmlProfilerAdapter(QQmlProfilerService *service, QQmlEngin } // convert to QByteArrays that can be sent to the debug client -// use of QDataStream can skew results -// (see tst_qqmldebugtrace::trace() benchmark) static void qQmlProfilerDataToByteArrays(const QQmlProfilerData &d, QQmlProfiler::LocationHash &locations, QList<QByteArray> &messages, diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.cpp b/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.cpp index 0c9fc36463..35beb0ee0d 100644 --- a/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.cpp +++ b/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.cpp @@ -74,8 +74,6 @@ QQuickProfilerAdapter::~QQuickProfilerAdapter() } // convert to QByteArrays that can be sent to the debug client -// use of QDataStream can skew results -// (see tst_qqmldebugtrace::trace() benchmark) static void qQuickProfilerDataToByteArrays(const QQuickProfilerData &data, QList<QByteArray> &messages) { |