feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

AutoTest: Fix wrong encoding handling

Browse Source 
Change-Id: I309eae71aae0d4591b9eb20a524e4ce2bcee8d6b
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2019-01-30 08:28:22 +01:00
parent b93f21d87a
commit 7cf3ea7255
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/autotest/qtest/qttestoutputreader.cpp
View File

@@ -188,9 +188,7 @@ void QtTestOutputReader::processXMLOutput(const QByteArray &outputLine)
if (m_className.isEmpty() && outputLine.trimmed().isEmpty()) if (m_className.isEmpty() && outputLine.trimmed().isEmpty())
return; return;
// avoid encoding problems for Quick tests m_xmlReader.addData(QString::fromUtf8(outputLine));
m_xmlReader.addData(m_testType == TestType::QuickTest ? QString::fromLatin1(outputLine)
: QString::fromLocal8Bit(outputLine));
while (!m_xmlReader.atEnd()) { while (!m_xmlReader.atEnd()) {
if (m_futureInterface.isCanceled()) if (m_futureInterface.isCanceled())
return; return;