From d164ec4abe75726469f2cfcff418602ad710408e Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 24 Jul 2023 09:53:52 +0200 Subject: [PATCH] QXmlStreamReader: Fix translation context of error messages QObject::tr() should not be used. Amends c4301be7d5f94852e1b17f2c2989d5ca807855d4. Task-number: QTBUG-92113 Task-number: QTBUG-95188 Pick-to: 6.6 6.5 Change-Id: I09547c3d048d6b3726e33be74b06035f0eec4f31 Reviewed-by: Axel Spoerl --- src/corelib/serialization/qxmlstream.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp index 07211fe2ea..6e2c0cb9ea 100644 --- a/src/corelib/serialization/qxmlstream.cpp +++ b/src/corelib/serialization/qxmlstream.cpp @@ -3926,7 +3926,7 @@ void QXmlStreamReaderPrivate::checkToken() if (!ok) { raiseError(QXmlStreamReader::UnexpectedElementError, - QObject::tr("Unexpected token type %1 in %2.") + QXmlStream::tr("Unexpected token type %1 in %2.") .arg(q->tokenString(), contextString(context))); return; } @@ -3937,7 +3937,7 @@ void QXmlStreamReaderPrivate::checkToken() // Raise error on multiple DTD tokens if (foundDTD) { raiseError(QXmlStreamReader::UnexpectedElementError, - QObject::tr("Found second DTD token in %1.").arg(contextString(context))); + QXmlStream::tr("Found second DTD token in %1.").arg(contextString(context))); } else { foundDTD = true; }