Fix compile time qsTranslate with empty context

An empty context is to be passed as-is. We shall not replace it with the
file context context. Since the TranslationData struct has a field for
the context, we need to invent a "no context" value we use for the
methods that don't allow you to set a context (e.g. qsTr, qsTrId). We
cannot use 0 because that is the empty string which is a valid context
now.

Amends commit 9cfc19faf5d1ce2b9626914ab4528998b072385d.

Pick-to: 6.6 6.5
Fixes: QTBUG-118469
Change-Id: I160c512f42aba4a8ae2fc8860cdf4e50c53d9d3e
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 4 insertions, 2 deletions

diff --git a/src/qml/jsruntime/qv4executablecompilationunit.cpp b/src/qml/jsruntime/qv4executablecompilationunit.cpp
index 9b4b2353c5..bd43d3cb97 100644
--- a/src/qml/jsruntime/qv4executablecompilationunit.cpp
+++ b/src/qml/jsruntime/qv4executablecompilationunit.cpp
@@ -974,11 +974,13 @@ QString ExecutableCompilationUnit::translateFrom(TranslationDataIndex index) con
         return context.toUtf8();
     };
 
-    QByteArray context = stringAt(translation.contextIndex).toUtf8();
+    const bool hasContext
+            = translation.contextIndex != QV4::CompiledData::TranslationData::NoContextIndex;
     QByteArray comment = stringAt(translation.commentIndex).toUtf8();
     QByteArray text = stringAt(translation.stringIndex).toUtf8();
     return QCoreApplication::translate(
-                context.isEmpty() ? fileContext() : context, text, comment, translation.number);
+            hasContext ? stringAt(translation.contextIndex).toUtf8() : fileContext(),
+            text, comment, translation.number);
 #endif
 }