diff options
Diffstat (limited to 'src/qml/debugger/qqmldebugserviceinterfaces.cpp')
| -rw-r--r-- | src/qml/debugger/qqmldebugserviceinterfaces.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/qml/debugger/qqmldebugserviceinterfaces.cpp b/src/qml/debugger/qqmldebugserviceinterfaces.cpp index 9ef5058803..db1ec2db5e 100644 --- a/src/qml/debugger/qqmldebugserviceinterfaces.cpp +++ b/src/qml/debugger/qqmldebugserviceinterfaces.cpp @@ -54,7 +54,7 @@ const TranslationBindingInformation TranslationBindingInformation::create( QQmlTranslation translation; if (binding->type() == QV4::CompiledData::Binding::Type_TranslationById) { const QV4::CompiledData::TranslationData data = - compilationUnit->data->translations()[binding->value.translationDataIndex]; + compilationUnit->unitData()->translations()[binding->value.translationDataIndex]; const QString id = compilationUnit->stringAt(data.stringIndex); const int n = data.number; @@ -63,17 +63,20 @@ const TranslationBindingInformation TranslationBindingInformation::create( Q_ASSERT(binding->type() == QV4::CompiledData::Binding::Type_Translation); const QV4::CompiledData::TranslationData data = - compilationUnit->data->translations()[binding->value.translationDataIndex]; + compilationUnit->unitData()->translations()[binding->value.translationDataIndex]; const QString text = compilationUnit->stringAt(data.stringIndex); const QString comment = compilationUnit->stringAt(data.commentIndex); - const QString context = compilationUnit->stringAt(data.contextIndex); + const bool hasContext + = data.contextIndex != QV4::CompiledData::TranslationData::NoContextIndex; const int n = data.number; translation = QQmlTranslation( - QQmlTranslation::QsTrData(context.isEmpty() - ? QQmlTranslation::contextFromQmlFilename( - compilationUnit->fileName()) - : context, text, comment, n)); + QQmlTranslation::QsTrData( + hasContext + ? compilationUnit->stringAt(data.contextIndex) + : QQmlTranslation::contextFromQmlFilename( + compilationUnit->fileName()), + text, comment, n)); } return { compilationUnit, |