aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhao Yuhang <2546789017@qq.com>2025-04-24 21:28:52 +0800
committerZhao Yuhang <2546789017@qq.com>2025-04-29 01:15:02 +0000
commit82f00fcc1f98eae5cbe640fe445616cc98c912d0 (patch)
tree3658ec3f5950e45c0e084fe07cb0798f690a51c7
parent5e8fba77156623d9de7b686d09aa35ff9e15e571 (diff)
QQmlTranslation: fix build error
There will be compilation errors if QByteArray's implicit conversion to const char* is disabled (which is possible in some user configurations). Just convert QByteArray to const char* manually, don't rely on such implicit conversions. Change-Id: I7b68066bc82a0a64f38ad8f9903d06ffe4bb0754 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
-rw-r--r--src/qml/common/qqmltranslation_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/common/qqmltranslation_p.h b/src/qml/common/qqmltranslation_p.h
index e840688aef..f132ed88a0 100644
--- a/src/qml/common/qqmltranslation_p.h
+++ b/src/qml/common/qqmltranslation_p.h
@@ -45,7 +45,7 @@ public:
QString translate() const
{
#if QT_CONFIG(translation)
- return QCoreApplication::translate(m_context, m_text, m_comment, m_number);
+ return QCoreApplication::translate(m_context.constData(), m_text.constData(), m_comment.constData(), m_number);
#else
return QString();
#endif
@@ -71,7 +71,7 @@ public:
QString translate() const
{
#if QT_CONFIG(translation)
- return qtTrId(m_id, m_number);
+ return qtTrId(m_id.constData(), m_number);
#else
return QString();
#endif