From d7ccd8cb4565c8643b158891c9de3187c1586dc9 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Wed, 17 Jun 2020 22:53:53 +0200 Subject: Remove QByteArray's methods taking QString and their uses [ChangeLog][QtCore][QByteArray] Remove method overloads taking QString as argument, all of which were equivalent to passing the toUtf8() of the string instead. Change-Id: I9251733a9b3711153b2faddbbc907672a7cba190 Reviewed-by: Edward Welbourne Reviewed-by: Lars Knoll --- tests/auto/gui/image/qimagereader/tst_qimagereader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/auto/gui/image/qimagereader/tst_qimagereader.cpp') diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp index 6001829854..bea7d610b8 100644 --- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp +++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp @@ -1803,7 +1803,7 @@ static QByteArray msgIgnoreFormatAndExtensionFail(const QString &sourceFileName, QByteArray result = "Failure for '"; result += sourceFileName.toLocal8Bit(); result += "' as '"; - result += targetFileName; + result += targetFileName.toLocal8Bit(); result += "', detected as: '"; result += detectedFormat.toLocal8Bit(); result += '\''; @@ -1825,7 +1825,7 @@ void tst_QImageReader::testIgnoresFormatAndExtension() tempPath += QLatin1Char('/'); foreach (const QByteArray &f, formats) { - if (f == extension) + if (f == extension.toLocal8Bit()) continue; QFile tmp(tempPath + name + QLatin1Char('_') + expected + QLatin1Char('.') + f); -- cgit v1.2.3