1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QXmlStreamReader: Fix translation context of error messages

Browse Source 
QObject::tr() should not be used.

Amends c4301be7d5f94852e1b17f2c2989d5ca807855d4.

Task-number: QTBUG-92113
Task-number: QTBUG-95188
Change-Id: I09547c3d048d6b3726e33be74b06035f0eec4f31
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit d164ec4abe75726469f2cfcff418602ad710408e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Friedemann Kleint 2023-07-24 09:53:52 +02:00 committed by Qt Cherry-pick Bot
parent c4a7f22e3e
commit e067969ef7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/serialization/qxmlstream.cpp
View File

@ -3926,7 +3926,7 @@ void QXmlStreamReaderPrivate::checkToken()
if (!ok) { if (!ok) {
raiseError(QXmlStreamReader::UnexpectedElementError, raiseError(QXmlStreamReader::UnexpectedElementError,
QObject::tr("Unexpected token type %1 in %2.") QXmlStream::tr("Unexpected token type %1 in %2.")
.arg(q->tokenString(), contextString(context))); .arg(q->tokenString(), contextString(context)));
return; return;
} }
@ -3937,7 +3937,7 @@ void QXmlStreamReaderPrivate::checkToken()
// Raise error on multiple DTD tokens // Raise error on multiple DTD tokens
if (foundDTD) { if (foundDTD) {
raiseError(QXmlStreamReader::UnexpectedElementError, 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 { } else {
foundDTD = true; foundDTD = true;
} }