diff options
Diffstat (limited to 'src/plugins/qmltooling')
3 files changed, 11 insertions, 10 deletions
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp index 3afda162e6..89baceeb36 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp +++ b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp @@ -808,9 +808,9 @@ bool QQmlEngineDebugServiceImpl::setMethodBody(int objectId, const QString &meth int lineNumber = 0; QV4::ScopedFunctionObject oldMethod(scope, vmeMetaObject->vmeMethod(prop->coreIndex())); - if (oldMethod && oldMethod->d()->function) { - lineNumber = oldMethod->d()->function->compiledFunction->location.line; - } + if (oldMethod && oldMethod->d()->function) + lineNumber = oldMethod->d()->function->compiledFunction->location.line(); + QV4::ScopedValue v(scope, QQmlJavaScriptExpression::evalFunction(contextData, object, jsfunction, contextData->urlString(), lineNumber)); vmeMetaObject->setVmeMethod(prop->coreIndex(), v); return true; diff --git a/src/plugins/qmltooling/qmldbg_preview/proxytranslator.cpp b/src/plugins/qmltooling/qmldbg_preview/proxytranslator.cpp index b9641066e1..ddf2df12ff 100644 --- a/src/plugins/qmltooling/qmldbg_preview/proxytranslator.cpp +++ b/src/plugins/qmltooling/qmldbg_preview/proxytranslator.cpp @@ -75,9 +75,10 @@ QString ProxyTranslator::originStringFromInformation(const TranslationBindingInf QQmlSourceLocation ProxyTranslator::sourceLocationFromInformation(const TranslationBindingInformation &translationBindingInformation) { - return QQmlSourceLocation(translationBindingInformation.compilationUnit->fileName(), - translationBindingInformation.compiledBinding->valueLocation.line, - translationBindingInformation.compiledBinding->valueLocation.column); + return QQmlSourceLocation( + translationBindingInformation.compilationUnit->fileName(), + translationBindingInformation.compiledBinding->valueLocation.line(), + translationBindingInformation.compiledBinding->valueLocation.column()); } diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.cpp b/src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.cpp index c7e4d0e4e6..8107b8a535 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.cpp +++ b/src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.cpp @@ -72,8 +72,8 @@ QDebug operator<<(QDebug debug, const TranslationBindingInformation &translation { QQmlError error; error.setUrl(translationBindingInformation.compilationUnit->url()); - error.setLine(translationBindingInformation.compiledBinding->valueLocation.line); - error.setColumn(translationBindingInformation.compiledBinding->valueLocation.column); + error.setLine(translationBindingInformation.compiledBinding->valueLocation.line()); + error.setColumn(translationBindingInformation.compiledBinding->valueLocation.column()); error.setDescription( QString(QLatin1String( "QDebug translation binding" @@ -299,8 +299,8 @@ private: { CodeMarker c; c.url = information.compilationUnit->url(); - c.line = information.compiledBinding->valueLocation.line; - c.column = information.compiledBinding->valueLocation.column; + c.line = information.compiledBinding->valueLocation.line(); + c.column = information.compiledBinding->valueLocation.column(); return c; } QString currentStateName; |